Merge remote-tracking branch 'origin/dev' into dev

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java

@@ -167,7 +167,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
         domainQuery.setPageNum(query.getCurrent());
         domainQuery.setPageSize(query.getSize());
         domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
-        domainQuery.setFilingNo(query.getFilingNo());
+        domainQuery.setId(query.getId());
         domainQuery.setFilingUnitName(query.getFilingUnitName());
         domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
         domainQuery.setFilingStatusCode(query.getFilingStatusCode());
@@ -183,7 +183,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
         domainQuery.setPageNum(query.getCurrent());
         domainQuery.setPageSize(query.getSize());
         domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
-        domainQuery.setFilingNo(query.getFilingNo());
+        domainQuery.setId(query.getId());
         domainQuery.setFilingUnitName(query.getFilingUnitName());
         domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
         domainQuery.setFilingStatusCode(query.getFilingStatusCode());

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java

@@ -17,7 +17,8 @@ public class QualFilingChangePageQuery extends BasePageQuery {
     private Long orgId;
 
     @ApiModelProperty(value = "备案编号")
-    private String filingNo;
+//    private String filingNo;
+    private Long id;
 
     @ApiModelProperty(value = "备案单位")
     private String filingUnitName;

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java

@@ -28,6 +28,8 @@ public class QualFilingChangeQuery {
     /** 备案编号 */
     private String filingNo;
 
+    private Long id;
+
     /** 备案单位 */
     private String filingUnitName;
 

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java

@@ -122,6 +122,9 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
         if (StringUtils.hasText(query.getFilingNo())) {
             wrapper.like(QualFilingChangeDO::getFilingNo, query.getFilingNo());
         }
+        if (query.getId() != null) {
+            wrapper.eq(QualFilingChangeDO::getId, query.getId());
+        }
         if (StringUtils.hasText(query.getFilingUnitName())) {
             wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName());
         }

safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml

@@ -100,6 +100,9 @@
                 <if test="query.filingNo != null and query.filingNo != ''">
                     AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%')
                 </if>
+                <if test="query.id != null ">
+                    AND qfc.id = #{query.id}
+                </if>
                 <if test="query.filingUnitName != null and query.filingUnitName != ''">
                     AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
                 </if>