cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

dev
luotaiqian 2026-07-09 13:56:59 +08:00
parent ea86f4693b
commit bbc90c2e61
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setId(query.getId()); domainQuery.setFilingNo(query.getFilingNo());
domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode());
@ -183,7 +183,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
domainQuery.setId(query.getId()); domainQuery.setFilingNo(query.getFilingNo());
domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode());
@ -205,7 +205,10 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
.collect(Collectors.toMap( .collect(Collectors.toMap(
QualFilingChangeCountDO::getFilingId, QualFilingChangeCountDO::getFilingId,
QualFilingChangeCountDO::getChangeCount)); 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()); return PageResponse.of(records, result.getTotal());
@ -239,10 +242,10 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
return SingleResponse.success(); return SingleResponse.success();
} }
@Override @Override
public SingleResponse<List<QualFilingChangeComplianceCheckResultCO>> complianceCheck(Long id) { public SingleResponse<List<QualFilingChangeComplianceCheckResultCO>> complianceCheck(Long id) {
return SingleResponse.success(qualFilingOrchestrator.complianceCheckChange(id)); return SingleResponse.success(qualFilingOrchestrator.complianceCheckChange(id));
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)

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

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

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

@ -120,11 +120,9 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
wrapper.eq(QualFilingChangeDO::getFilingId, query.getFilingId()); wrapper.eq(QualFilingChangeDO::getFilingId, query.getFilingId());
} }
if (StringUtils.hasText(query.getFilingNo())) { if (StringUtils.hasText(query.getFilingNo())) {
wrapper.like(QualFilingChangeDO::getFilingNo, query.getFilingNo()); wrapper.eq(QualFilingChangeDO::getId, query.getFilingNo());
}
if (query.getId() != null) {
wrapper.eq(QualFilingChangeDO::getId, query.getId());
} }
if (StringUtils.hasText(query.getFilingUnitName())) { if (StringUtils.hasText(query.getFilingUnitName())) {
wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName()); wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName());
} }
@ -288,7 +286,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
entity.setFilingUnitName(dataObject.getFilingUnitName()); entity.setFilingUnitName(dataObject.getFilingUnitName());
entity.setFilingUnitTypeCode(dataObject.getFilingUnitTypeCode()); entity.setFilingUnitTypeCode(dataObject.getFilingUnitTypeCode());
entity.setFilingUnitTypeName(dataObject.getFilingUnitTypeName()); entity.setFilingUnitTypeName(dataObject.getFilingUnitTypeName());
entity.setFilingNo(dataObject.getFilingNo()); entity.setFilingNo(String.valueOf(dataObject.getId()));
entity.setBusinessScope(dataObject.getBusinessScope()); entity.setBusinessScope(dataObject.getBusinessScope());
entity.setRegisterAddress(dataObject.getRegisterAddress()); entity.setRegisterAddress(dataObject.getRegisterAddress());
entity.setOfficeAddress(dataObject.getOfficeAddress()); entity.setOfficeAddress(dataObject.getOfficeAddress());

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

@ -98,10 +98,7 @@
qfc.delete_enum = 'false' qfc.delete_enum = 'false'
AND qfc.org_id = #{query.orgId} AND qfc.org_id = #{query.orgId}
<if test="query.filingNo != null and query.filingNo != ''"> <if test="query.filingNo != null and query.filingNo != ''">
AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%') AND qfc.id = #{query.filingNo}
</if>
<if test="query.id != null ">
AND qfc.id = #{query.id}
</if> </if>
<if test="query.filingUnitName != null and query.filingUnitName != ''"> <if test="query.filingUnitName != null and query.filingUnitName != ''">
AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%') AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')