diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java
index 2fe23f2..5fc9d5f 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java
@@ -33,4 +33,7 @@ public class BasePageQuery {
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "keyword")
+ private String keyword;
}
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
index 37512a8..25813d0 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
@@ -63,17 +63,14 @@
select info.credit_code as creditCode, info.unit_name as unitName, filing.* from org_info as info
left join qual_filing as filing on info.id = filing.org_id
where 1=1
-
- and info.credit_code = #{query.creditCode}
-
-
- and info.unit_name like concat('%',#{query.unitName},'%')
+
+ and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%'))
and filing.alert_status = #{query.alertStatus}
- and filing.expert_status like concat('%',#{query.unitName},'%')
+ and JSON_CONTAINS(filing.business_scope, CONCAT('"', #{query.businessScope}, '"'))
order by filing.id desc