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

Compare commits

base: cq_anquan:96417941c00d9f247d0560d8f072ce93dacce6fc
Branches Tags
cq_anquan:dev
cq_anquan:dev-deployment
cq_anquan:dev_1.0.1
cq_anquan:master
..
compare: cq_anquan:4d73bc798e7b7913b0587a749ca2902d77841889
Branches Tags
cq_anquan:dev
cq_anquan:dev-deployment
cq_anquan:dev_1.0.1
cq_anquan:master

No commits in common. "96417941c00d9f247d0560d8f072ce93dacce6fc" and "4d73bc798e7b7913b0587a749ca2902d77841889" have entirely different histories.
96417941c0 ... 4d73bc798e

4 changed files with 18 additions and 15 deletions
Show Stats Expand all files Collapse all files

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

@ -170,7 +170,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());
@ -186,7 +186,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());
@ -208,10 +208,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
.collect(Collectors.toMap(
QualFilingChangeCountDO::getFilingId,
QualFilingChangeCountDO::getChangeCount));
records.forEach(co -> {
co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1);
co.setFilingNo(String.valueOf(co.getId()));
});
records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1));
}
return PageResponse.of(records, result.getTotal());

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

@ -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;

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

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

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

@ -98,7 +98,10 @@
qfc.delete_enum = 'false'
AND qfc.org_id = #{query.orgId}
<if test="query.filingNo != null and query.filingNo != ''">
AND qfc.id = #{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}, '%')