archive file

safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java

@@ -284,6 +284,7 @@ public class QualFilingOrchestrator {
         domainQuery.setBusinessScope(query.getBusinessScope());
         domainQuery.setNeedExpertCheck(query.getNeedExpertCheck());
         domainQuery.setFilingStatusCode(query.getFilingStatusCode());
+        domainQuery.setFilingTerritoryName(query.getFilingTerritoryName());
         domainQuery.setApplyTypeCode(query.getApplyTypeCode());
         domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
         domainQuery.setSupervision(query.getSupervision());
@@ -772,7 +773,7 @@ public class QualFilingOrchestrator {
 
     private String resolveOperatorName() {
         String userName = AuthUserContextAdapter.getCurrentUserName();
-        return StringUtils.hasText(userName) ? userName : "系统" ;
+        return StringUtils.hasText(userName) ? userName : "系统";
     }
 
     private QualFilingCO toCO(QualFilingEntity entity) {

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

@@ -40,6 +40,8 @@ public class QualFilingPageQuery extends BasePageQuery {
     @ApiModelProperty(value = "备案属地编码")
     private String filingTerritoryCode;
 
+    private String filingTerritoryName;
+
     @ApiModelProperty(value = "是否为监管端查询,true-false")
     private Boolean supervision = false;
 }

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

@@ -52,6 +52,8 @@ public class QualFilingQuery {
     /** 备案属地编码 */
     private String filingTerritoryCode;
 
+    private String filingTerritoryName;
+
     /** 分页场景：change=备案变更列表 */
     private String scene;
 

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

@@ -118,6 +118,9 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
         if (StringUtils.hasText(query.getFilingUnitTypeName())) {
             wrapper.like(QualFilingDO::getFilingUnitTypeName, query.getFilingUnitTypeName());
         }
+        if (StringUtils.hasText(query.getFilingTerritoryName())){
+            wrapper.like(QualFilingDO::getFilingTerritoryName, query.getFilingTerritoryName());
+        }
         if (StringUtils.hasText(query.getBusinessScope())) {
             wrapper.like(QualFilingDO::getBusinessScope, query.getBusinessScope());
         }