diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index 6b6ca4be..fbeb1dff 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/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) { diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java index 1cab495e..a110a7d3 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java +++ b/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; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java index 4a623bcf..14074be6 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java +++ b/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; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index 60176487..e6dd4d70 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/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()); }