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 13ade60..05aa97c 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.setFilingNo(query.getFilingNo());
+ domainQuery.setId(query.getId());
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.setFilingNo(query.getFilingNo());
+ domainQuery.setId(query.getId());
domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode());
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 5c6f517..76139d0 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,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;
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java
index 79d7e32..c55fce7 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java
@@ -28,6 +28,8 @@ public class QualFilingChangeQuery {
/** 备案编号 */
private String filingNo;
+ private Long id;
+
/** 备案单位 */
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 4ca8e94..01e172e 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
@@ -122,6 +122,9 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
if (StringUtils.hasText(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());
}
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
index c2dc151..0894e9a 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
@@ -100,6 +100,9 @@
AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%')
+
+ AND qfc.id = #{query.id}
+
AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')