diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index 05aa97c..88c4b5c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/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.setId(query.getId()); + domainQuery.setFilingNo(query.getFilingNo()); 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.setId(query.getId()); + domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); @@ -205,7 +205,10 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { .collect(Collectors.toMap( QualFilingChangeCountDO::getFilingId, QualFilingChangeCountDO::getChangeCount)); - records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1)); + records.forEach(co -> { + co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1); + co.setFilingNo(String.valueOf(co.getId())); + }); } return PageResponse.of(records, result.getTotal()); @@ -239,10 +242,10 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { return SingleResponse.success(); } - @Override - public SingleResponse> complianceCheck(Long id) { - return SingleResponse.success(qualFilingOrchestrator.complianceCheckChange(id)); - } + @Override + public SingleResponse> complianceCheck(Long id) { + return SingleResponse.success(qualFilingOrchestrator.complianceCheckChange(id)); + } @Override @Transactional(rollbackFor = Exception.class) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java index 76139d0..5c6f517 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java @@ -17,8 +17,7 @@ public class QualFilingChangePageQuery extends BasePageQuery { private Long orgId; @ApiModelProperty(value = "备案编号") -// private String filingNo; - private Long id; + private String filingNo; @ApiModelProperty(value = "备案单位") private String filingUnitName; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java index 01e172e..96f7a94 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java @@ -120,11 +120,9 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { wrapper.eq(QualFilingChangeDO::getFilingId, query.getFilingId()); } if (StringUtils.hasText(query.getFilingNo())) { - wrapper.like(QualFilingChangeDO::getFilingNo, query.getFilingNo()); - } - if (query.getId() != null) { - wrapper.eq(QualFilingChangeDO::getId, query.getId()); + wrapper.eq(QualFilingChangeDO::getId, query.getFilingNo()); } + if (StringUtils.hasText(query.getFilingUnitName())) { wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName()); } @@ -288,7 +286,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { entity.setFilingUnitName(dataObject.getFilingUnitName()); entity.setFilingUnitTypeCode(dataObject.getFilingUnitTypeCode()); entity.setFilingUnitTypeName(dataObject.getFilingUnitTypeName()); - entity.setFilingNo(dataObject.getFilingNo()); + entity.setFilingNo(String.valueOf(dataObject.getId())); entity.setBusinessScope(dataObject.getBusinessScope()); entity.setRegisterAddress(dataObject.getRegisterAddress()); entity.setOfficeAddress(dataObject.getOfficeAddress()); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml index 0894e9a..4d87d62 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml @@ -98,10 +98,7 @@ qfc.delete_enum = 'false' AND qfc.org_id = #{query.orgId} - AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%') - - - AND qfc.id = #{query.id} + AND qfc.id = #{query.filingNo} AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')