From 628aa5d24f1561ba5995c4b83db84dc03784cc71 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Sat, 8 Aug 2026 15:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E7=94=B3=E8=AF=B7,=20?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/QualFilingChangeExecutor.java | 14 +++++++++- .../app/executor/QualFilingExecutor.java | 6 +++++ .../orchestrator/QualFilingOrchestrator.java | 27 ++++++++++++++----- .../app/support/QualFilingChangeDiffer.java | 4 +++ .../safetyeval/client/co/QualFilingCO.java | 13 +++++++-- .../client/co/QualFilingChangeCO.java | 13 +++++++-- .../client/co/QualFilingChangeOrgCO.java | 13 +++++++-- .../client/dto/QualFilingAddCmd.java | 13 +++++++-- .../client/dto/QualFilingChangeAddCmd.java | 18 ++++++++++--- .../client/dto/QualFilingChangeModifyCmd.java | 13 +++++++-- .../client/dto/QualFilingChangePageQuery.java | 2 +- .../client/dto/QualFilingModifyCmd.java | 13 +++++++-- .../client/dto/QualFilingPageQuery.java | 2 +- .../domain/entity/QualFilingChangeEntity.java | 19 +++++++++++-- .../domain/entity/QualFilingEntity.java | 13 +++++++-- .../domain/query/QualFilingChangeQuery.java | 2 +- .../domain/query/QualFilingQuery.java | 2 +- .../dataobject/QualFilingChangeDO.java | 3 +++ .../dataobject/QualFilingDO.java | 3 +++ .../QualFilingChangeGatewayImpl.java | 10 +++++-- .../gatewayimpl/QualFilingGatewayImpl.java | 10 ++++--- .../mapper/QualFilingChangeMapper.xml | 10 +++++-- .../resources/mapper/QualFilingMapper.xml | 5 +++- 23 files changed, 189 insertions(+), 39 deletions(-) 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 f36df094..2a91521d 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 @@ -114,8 +114,11 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { entity.setOfficeAddress(cmd.getOfficeAddress()); entity.setCreditCode(cmd.getCreditCode()); entity.setQualCertNo(cmd.getQualCertNo()); + entity.setLegalRepresentative(cmd.getLegalRepresentative()); entity.setLegalPersonPhone(cmd.getLegalPersonPhone()); + entity.setContactName(cmd.getContactName()); entity.setContactPhone(cmd.getContactPhone()); + entity.setFax(cmd.getFax()); entity.setInfoDisclosureUrl(cmd.getInfoDisclosureUrl()); entity.setFixedAssetAmount(cmd.getFixedAssetAmount()); entity.setArchiveRoomArea(cmd.getArchiveRoomArea()); @@ -152,8 +155,11 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { entity.setOfficeAddress(cmd.getOfficeAddress()); entity.setCreditCode(cmd.getCreditCode()); entity.setQualCertNo(cmd.getQualCertNo()); + entity.setLegalRepresentative(cmd.getLegalRepresentative()); entity.setLegalPersonPhone(cmd.getLegalPersonPhone()); + entity.setContactName(cmd.getContactName()); entity.setContactPhone(cmd.getContactPhone()); + entity.setFax(cmd.getFax()); entity.setInfoDisclosureUrl(cmd.getInfoDisclosureUrl()); entity.setFixedAssetAmount(cmd.getFixedAssetAmount()); entity.setArchiveRoomArea(cmd.getArchiveRoomArea()); @@ -220,7 +226,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { QualFilingChangeCountDO::getChangeCount)); records.forEach(co -> { co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1); - co.setFilingNo(String.valueOf(co.getId())); }); } @@ -619,9 +624,13 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { || !Objects.equals(exist.getRegisterAddress(), newEntity.getRegisterAddress()) || !Objects.equals(exist.getOfficeAddress(), newEntity.getOfficeAddress()) || !Objects.equals(exist.getCreditCode(), newEntity.getCreditCode()) + || !Objects.equals(exist.getFilingNo(), newEntity.getFilingNo()) || !Objects.equals(exist.getQualCertNo(), newEntity.getQualCertNo()) + || !Objects.equals(exist.getLegalRepresentative(), newEntity.getLegalRepresentative()) || !Objects.equals(exist.getLegalPersonPhone(), newEntity.getLegalPersonPhone()) + || !Objects.equals(exist.getContactName(), newEntity.getContactName()) || !Objects.equals(exist.getContactPhone(), newEntity.getContactPhone()) + || !Objects.equals(exist.getFax(), newEntity.getFax()) || !Objects.equals(exist.getInfoDisclosureUrl(), newEntity.getInfoDisclosureUrl()) || !Objects.equals(exist.getFixedAssetAmount(), newEntity.getFixedAssetAmount()) || !Objects.equals(exist.getArchiveRoomArea(), newEntity.getArchiveRoomArea()) @@ -726,8 +735,11 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { co.setOfficeAddress(entity.getOfficeAddress()); co.setCreditCode(entity.getCreditCode()); co.setQualCertNo(entity.getQualCertNo()); + co.setLegalRepresentative(entity.getLegalRepresentative()); co.setLegalPersonPhone(entity.getLegalPersonPhone()); + co.setContactName(entity.getContactName()); co.setContactPhone(entity.getContactPhone()); + co.setFax(entity.getFax()); co.setInfoDisclosureUrl(entity.getInfoDisclosureUrl()); co.setFixedAssetAmount(entity.getFixedAssetAmount()); co.setArchiveRoomArea(entity.getArchiveRoomArea()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java index 64ba46c2..697b70c6 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java @@ -92,8 +92,11 @@ public class QualFilingExecutor implements QualFilingApi { entity.setOfficeAddress(cmd.getOfficeAddress()); entity.setCreditCode(cmd.getCreditCode()); entity.setQualCertNo(cmd.getQualCertNo()); + entity.setLegalRepresentative(cmd.getLegalRepresentative()); entity.setLegalPersonPhone(cmd.getLegalPersonPhone()); + entity.setContactName(cmd.getContactName()); entity.setContactPhone(cmd.getContactPhone()); + entity.setFax(cmd.getFax()); entity.setInfoDisclosureUrl(cmd.getInfoDisclosureUrl()); entity.setFixedAssetAmount(cmd.getFixedAssetAmount()); entity.setArchiveRoomArea(cmd.getArchiveRoomArea()); @@ -318,8 +321,11 @@ public class QualFilingExecutor implements QualFilingApi { co.setOfficeAddress(entity.getOfficeAddress()); co.setCreditCode(entity.getCreditCode()); co.setQualCertNo(entity.getQualCertNo()); + co.setLegalRepresentative(entity.getLegalRepresentative()); co.setLegalPersonPhone(entity.getLegalPersonPhone()); + co.setContactName(entity.getContactName()); co.setContactPhone(entity.getContactPhone()); + co.setFax(entity.getFax()); co.setInfoDisclosureUrl(entity.getInfoDisclosureUrl()); co.setFixedAssetAmount(entity.getFixedAssetAmount()); co.setArchiveRoomArea(entity.getArchiveRoomArea()); 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 eec2fd06..dcb345d1 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 @@ -291,13 +291,7 @@ public class QualFilingOrchestrator { PageResult pageResult = qualFilingGateway.page(domainQuery); Map reviewMap = loadReviewMap(pageResult.getRecords()); List records = pageResult.getRecords().stream() - .map(entity -> { - QualFilingCO listCO = toListCO(entity, reviewMap); - if (listCO != null) { - listCO.setFilingNo(String.valueOf(entity.getId())); - } - return listCO; - }) + .map(entity -> toListCO(entity, reviewMap)) .collect(Collectors.toList()); return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize()); } @@ -611,9 +605,13 @@ public class QualFilingOrchestrator { origin.setRegisterAddress(draft.getRegisterAddress()); origin.setOfficeAddress(draft.getOfficeAddress()); origin.setCreditCode(draft.getCreditCode()); + origin.setFilingNo(draft.getFilingNo()); origin.setQualCertNo(draft.getQualCertNo()); + origin.setLegalRepresentative(draft.getLegalRepresentative()); origin.setLegalPersonPhone(draft.getLegalPersonPhone()); + origin.setContactName(draft.getContactName()); origin.setContactPhone(draft.getContactPhone()); + origin.setFax(draft.getFax()); origin.setInfoDisclosureUrl(draft.getInfoDisclosureUrl()); origin.setFixedAssetAmount(draft.getFixedAssetAmount()); origin.setArchiveRoomArea(draft.getArchiveRoomArea()); @@ -640,8 +638,11 @@ public class QualFilingOrchestrator { change.setOfficeAddress(draft.getOfficeAddress()); change.setCreditCode(draft.getCreditCode()); change.setQualCertNo(draft.getQualCertNo()); + change.setLegalRepresentative(draft.getLegalRepresentative()); change.setLegalPersonPhone(draft.getLegalPersonPhone()); + change.setContactName(draft.getContactName()); change.setContactPhone(draft.getContactPhone()); + change.setFax(draft.getFax()); change.setInfoDisclosureUrl(draft.getInfoDisclosureUrl()); change.setFixedAssetAmount(draft.getFixedAssetAmount()); change.setArchiveRoomArea(draft.getArchiveRoomArea()); @@ -695,12 +696,21 @@ public class QualFilingOrchestrator { if (cmd.getQualCertNo() != null) { entity.setQualCertNo(cmd.getQualCertNo()); } + if (cmd.getLegalRepresentative() != null) { + entity.setLegalRepresentative(cmd.getLegalRepresentative()); + } if (cmd.getLegalPersonPhone() != null) { entity.setLegalPersonPhone(cmd.getLegalPersonPhone()); } + if (cmd.getContactName() != null) { + entity.setContactName(cmd.getContactName()); + } if (cmd.getContactPhone() != null) { entity.setContactPhone(cmd.getContactPhone()); } + if (cmd.getFax() != null) { + entity.setFax(cmd.getFax()); + } if (cmd.getInfoDisclosureUrl() != null) { entity.setInfoDisclosureUrl(cmd.getInfoDisclosureUrl()); } @@ -762,8 +772,11 @@ public class QualFilingOrchestrator { co.setOfficeAddress(entity.getOfficeAddress()); co.setCreditCode(entity.getCreditCode()); co.setQualCertNo(entity.getQualCertNo()); + co.setLegalRepresentative(entity.getLegalRepresentative()); co.setLegalPersonPhone(entity.getLegalPersonPhone()); + co.setContactName(entity.getContactName()); co.setContactPhone(entity.getContactPhone()); + co.setFax(entity.getFax()); co.setInfoDisclosureUrl(entity.getInfoDisclosureUrl()); co.setFixedAssetAmount(entity.getFixedAssetAmount()); co.setArchiveRoomArea(entity.getArchiveRoomArea()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingChangeDiffer.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingChangeDiffer.java index 670ea61c..b6b4093a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingChangeDiffer.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingChangeDiffer.java @@ -63,9 +63,13 @@ public class QualFilingChangeDiffer { || !Objects.equals(origin.getRegisterAddress(), draft.getRegisterAddress()) || !Objects.equals(origin.getOfficeAddress(), draft.getOfficeAddress()) || !Objects.equals(origin.getCreditCode(), draft.getCreditCode()) + || !Objects.equals(origin.getFilingNo(), draft.getFilingNo()) || !Objects.equals(origin.getQualCertNo(), draft.getQualCertNo()) + || !Objects.equals(origin.getLegalRepresentative(), draft.getLegalRepresentative()) || !Objects.equals(origin.getLegalPersonPhone(), draft.getLegalPersonPhone()) + || !Objects.equals(origin.getContactName(), draft.getContactName()) || !Objects.equals(origin.getContactPhone(), draft.getContactPhone()) + || !Objects.equals(origin.getFax(), draft.getFax()) || !Objects.equals(origin.getInfoDisclosureUrl(), draft.getInfoDisclosureUrl()) || !Objects.equals(origin.getFixedAssetAmount(), draft.getFixedAssetAmount()) || !Objects.equals(origin.getArchiveRoomArea(), draft.getArchiveRoomArea()) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java index 0790ad21..27eb1958 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java @@ -34,7 +34,7 @@ public class QualFilingCO { @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "经营范围") @@ -49,15 +49,24 @@ public class QualFilingCO { @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + private String legalRepresentative; + @ApiModelProperty(value = "法定代表人电话") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + private String contactName; + @ApiModelProperty(value = "联系电话") private String contactPhone; + @ApiModelProperty(value = "传真") + private String fax; + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java index 069ef833..b75d2ba7 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java @@ -41,7 +41,7 @@ public class QualFilingChangeCO { @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "经营范围") @@ -56,15 +56,24 @@ public class QualFilingChangeCO { @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + private String legalRepresentative; + @ApiModelProperty(value = "法定代表人电话") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + private String contactName; + @ApiModelProperty(value = "联系电话") private String contactPhone; + @ApiModelProperty(value = "传真") + private String fax; + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java index 083b840c..b2892030 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java @@ -58,7 +58,7 @@ public class QualFilingChangeOrgCO { @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "经营范围") @@ -73,15 +73,24 @@ public class QualFilingChangeOrgCO { @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + private String legalRepresentative; + @ApiModelProperty(value = "法定代表人电话") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + private String contactName; + @ApiModelProperty(value = "联系电话") private String contactPhone; + @ApiModelProperty(value = "传真") + private String fax; + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java index 41d157a0..3f14007f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java @@ -32,7 +32,7 @@ public class QualFilingAddCmd { @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号-暂时使用id") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "备案安全评价业务范围") @@ -47,15 +47,24 @@ public class QualFilingAddCmd { @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + private String legalRepresentative; + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + private String contactName; + @ApiModelProperty(value = "联系人及电话") private String contactPhone; + @ApiModelProperty(value = "传真") + private String fax; + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java index 390accb8..2c422e42 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java @@ -50,8 +50,8 @@ public class QualFilingChangeAddCmd { @Size(max = 128, message = "备案单位类型名称不能超过128个字符") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号") - @Size(max = 64, message = "备案编号不能超过64个字符") + @ApiModelProperty(value = "资质证书编号") + @Size(max = 64, message = "资质证书编号不能超过64个字符") private String filingNo; @ApiModelProperty(value = "备案安全评价业务范围") @@ -69,18 +69,30 @@ public class QualFilingChangeAddCmd { @Size(max = 64, message = "统一社会信用代码不能超过64个字符") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") @Size(max = 64, message = "资质证书编号不能超过64个字符") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + @Size(max = 50, message = "法定代表人不能超过50个字符") + private String legalRepresentative; + @ApiModelProperty(value = "法人代表及电话") @Size(max = 12, message = "法人代表及电话不能超过12个字符") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + @Size(max = 50, message = "联系人不能超过50个字符") + private String contactName; + @ApiModelProperty(value = "联系人及电话") @Size(max = 12, message = "联系人及电话不能超过12个字符") private String contactPhone; + @ApiModelProperty(value = "传真") + @Size(max = 20, message = "传真不能超过20个字符") + private String fax; + @ApiModelProperty(value = "信息公开网址") @Size(max = 512, message = "信息公开网址不能超过512个字符") private String infoDisclosureUrl; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java index 8538a273..27f1a8ea 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java @@ -35,7 +35,7 @@ public class QualFilingChangeModifyCmd { @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "备案安全评价业务范围") @@ -50,15 +50,24 @@ public class QualFilingChangeModifyCmd { @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + private String legalRepresentative; + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + private String contactName; + @ApiModelProperty(value = "联系人及电话") private String contactPhone; + @ApiModelProperty(value = "传真") + private String fax; + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; 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 5c6f517d..6099a9ee 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 @@ -16,7 +16,7 @@ public class QualFilingChangePageQuery extends BasePageQuery { @ApiModelProperty(value = "单位id") private Long orgId; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "备案单位") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java index d41d4362..5ac662a6 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java @@ -31,7 +31,7 @@ public class QualFilingModifyCmd { @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "备案安全评价业务范围") @@ -46,15 +46,24 @@ public class QualFilingModifyCmd { @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - @ApiModelProperty(value = "资质证书编号") + @ApiModelProperty(value = "资质证书编号(旧字段，保留)") private String qualCertNo; + @ApiModelProperty(value = "法定代表人") + private String legalRepresentative; + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; + @ApiModelProperty(value = "联系人") + private String contactName; + @ApiModelProperty(value = "联系人及电话") private String contactPhone; + @ApiModelProperty(value = "传真") + private String fax; + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; 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 25390056..1cab495e 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 @@ -16,7 +16,7 @@ public class QualFilingPageQuery extends BasePageQuery { @ApiModelProperty(value = "单位id") private Long orgId; - @ApiModelProperty(value = "备案编号") + @ApiModelProperty(value = "资质证书编号") private String filingNo; @ApiModelProperty(value = "备案单位") diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java index e7308bec..5d8d59fb 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java @@ -74,7 +74,7 @@ public class QualFilingChangeEntity { private String filingUnitTypeName; /** - * 备案编号 + * 资质证书编号 */ private String filingNo; @@ -99,20 +99,35 @@ public class QualFilingChangeEntity { private String creditCode; /** - * 资质证书编号 + * 资质证书编号(旧字段，保留) */ private String qualCertNo; + /** + * 法定代表人 + */ + private String legalRepresentative; + /** * 法人代表及电话 */ private String legalPersonPhone; + /** + * 联系人 + */ + private String contactName; + /** * 联系人及电话 */ private String contactPhone; + /** + * 传真 + */ + private String fax; + /** * 信息公开网址 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java index 449a3b32..d35a4fcb 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java @@ -34,7 +34,7 @@ public class QualFilingEntity { /** 备案单位类型名称 */ private String filingUnitTypeName; - /** 备案编号 */ + /** 资质证书编号 */ private String filingNo; /** 备案安全评价业务范围 */ @@ -49,15 +49,24 @@ public class QualFilingEntity { /** 统一社会信用代码 */ private String creditCode; - /** 资质证书编号 */ + /** 资质证书编号(旧字段，保留) */ private String qualCertNo; + /** 法定代表人 */ + private String legalRepresentative; + /** 法人代表及电话 */ private String legalPersonPhone; + /** 联系人 */ + private String contactName; + /** 联系人及电话 */ private String contactPhone; + /** 传真 */ + private String fax; + /** 信息公开网址 */ private String infoDisclosureUrl; 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 c55fce76..034214ef 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 @@ -25,7 +25,7 @@ public class QualFilingChangeQuery { /** 备案申请ID */ private Long filingId; - /** 备案编号 */ + /** 资质证书编号 */ private String filingNo; private Long id; 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 23dccf39..4a623bcf 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 @@ -25,7 +25,7 @@ public class QualFilingQuery { /** 机构ID */ private Long orgId; - /** 备案编号 */ + /** 资质证书编号 */ private String filingNo; /** 备案单位 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java index fa065fd8..f7a4e17b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java @@ -33,8 +33,11 @@ public class QualFilingChangeDO { private String officeAddress; private String creditCode; private String qualCertNo; + private String legalRepresentative; private String legalPersonPhone; + private String contactName; private String contactPhone; + private String fax; private String infoDisclosureUrl; private Long fixedAssetAmount; private BigDecimal archiveRoomArea; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java index 80a2d8fd..bda2965f 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java @@ -29,8 +29,11 @@ public class QualFilingDO extends BaseDO { private String officeAddress; private String creditCode; private String qualCertNo; + private String legalRepresentative; private String legalPersonPhone; + private String contactName; private String contactPhone; + private String fax; private String infoDisclosureUrl; private Long fixedAssetAmount; private BigDecimal archiveRoomArea; 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 60f3599a..c7d4d806 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,7 +122,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { wrapper.eq(QualFilingChangeDO::getFilingId, query.getFilingId()); } if (StringUtils.hasText(query.getFilingNo())) { - wrapper.eq(QualFilingChangeDO::getId, query.getFilingNo()); + wrapper.eq(QualFilingChangeDO::getFilingNo, query.getFilingNo()); } if (StringUtils.hasText(query.getFilingUnitName())) { @@ -263,8 +263,11 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { dataObject.setOfficeAddress(entity.getOfficeAddress()); dataObject.setCreditCode(entity.getCreditCode()); dataObject.setQualCertNo(entity.getQualCertNo()); + dataObject.setLegalRepresentative(entity.getLegalRepresentative()); dataObject.setLegalPersonPhone(entity.getLegalPersonPhone()); + dataObject.setContactName(entity.getContactName()); dataObject.setContactPhone(entity.getContactPhone()); + dataObject.setFax(entity.getFax()); dataObject.setInfoDisclosureUrl(entity.getInfoDisclosureUrl()); dataObject.setFixedAssetAmount(entity.getFixedAssetAmount()); dataObject.setArchiveRoomArea(entity.getArchiveRoomArea()); @@ -295,14 +298,17 @@ 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(JSONUtil.toList(dataObject.getBusinessScope(), String.class)); entity.setRegisterAddress(dataObject.getRegisterAddress()); entity.setOfficeAddress(dataObject.getOfficeAddress()); entity.setCreditCode(dataObject.getCreditCode()); entity.setQualCertNo(dataObject.getQualCertNo()); + entity.setLegalRepresentative(dataObject.getLegalRepresentative()); entity.setLegalPersonPhone(dataObject.getLegalPersonPhone()); + entity.setContactName(dataObject.getContactName()); entity.setContactPhone(dataObject.getContactPhone()); + entity.setFax(dataObject.getFax()); entity.setInfoDisclosureUrl(dataObject.getInfoDisclosureUrl()); entity.setFixedAssetAmount(dataObject.getFixedAssetAmount()); entity.setArchiveRoomArea(dataObject.getArchiveRoomArea()); 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 362add99..df679467 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 @@ -110,9 +110,7 @@ public class QualFilingGatewayImpl implements QualFilingGateway { wrapper.eq(QualFilingDO::getOrgId, query.getOrgId()); } if (StringUtils.hasText(query.getFilingNo())) { - // 暂无编号数据, 使用id查询 - wrapper.eq(QualFilingDO::getId, query.getFilingNo()); -// wrapper.eq(QualFilingDO::getFilingNo, query.getFilingNo()); + wrapper.eq(QualFilingDO::getFilingNo, query.getFilingNo()); } if (StringUtils.hasText(query.getFilingUnitName())) { wrapper.like(QualFilingDO::getFilingUnitName, query.getFilingUnitName()); @@ -354,8 +352,11 @@ public class QualFilingGatewayImpl implements QualFilingGateway { dataObject.setOfficeAddress(entity.getOfficeAddress()); dataObject.setCreditCode(entity.getCreditCode()); dataObject.setQualCertNo(entity.getQualCertNo()); + dataObject.setLegalRepresentative(entity.getLegalRepresentative()); dataObject.setLegalPersonPhone(entity.getLegalPersonPhone()); + dataObject.setContactName(entity.getContactName()); dataObject.setContactPhone(entity.getContactPhone()); + dataObject.setFax(entity.getFax()); dataObject.setInfoDisclosureUrl(entity.getInfoDisclosureUrl()); dataObject.setFixedAssetAmount(entity.getFixedAssetAmount()); dataObject.setArchiveRoomArea(entity.getArchiveRoomArea()); @@ -396,8 +397,11 @@ public class QualFilingGatewayImpl implements QualFilingGateway { entity.setOfficeAddress(dataObject.getOfficeAddress()); entity.setCreditCode(dataObject.getCreditCode()); entity.setQualCertNo(dataObject.getQualCertNo()); + entity.setLegalRepresentative(dataObject.getLegalRepresentative()); entity.setLegalPersonPhone(dataObject.getLegalPersonPhone()); + entity.setContactName(dataObject.getContactName()); entity.setContactPhone(dataObject.getContactPhone()); + entity.setFax(dataObject.getFax()); entity.setInfoDisclosureUrl(dataObject.getInfoDisclosureUrl()); entity.setFixedAssetAmount(dataObject.getFixedAssetAmount()); entity.setArchiveRoomArea(dataObject.getArchiveRoomArea()); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml index e59620b6..460a44f2 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml @@ -22,8 +22,11 @@ + + + @@ -50,7 +53,7 @@ `id` - , `org_id`, `filing_id`, `change_filing_id`, `filing_review_id`, `reject_reason`, `submit_time`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `filing_status_code`, `filing_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + , `org_id`, `filing_id`, `change_filing_id`, `filing_review_id`, `reject_reason`, `submit_time`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_representative`, `legal_person_phone`, `contact_name`, `contact_phone`, `fax`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `filing_status_code`, `filing_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` @@ -74,8 +77,11 @@ + + + @@ -104,7 +110,7 @@ temp.rn = 1 - AND temp.id = #{query.filingNo} + AND temp.filing_no = #{query.filingNo} AND temp.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%') diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml index 154ea2b8..2de541ce 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml @@ -17,8 +17,11 @@ + + + @@ -50,7 +53,7 @@ - `id`, `org_id`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `origin_filing_id`, `reject_reason`, `submit_time`, `approve_time`, `filing_status_code`, `filing_status_name`, `apply_type_code`, `apply_type_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `org_id`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_representative`, `legal_person_phone`, `contact_name`, `contact_phone`, `fax`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `origin_filing_id`, `reject_reason`, `submit_time`, `approve_time`, `filing_status_code`, `filing_status_name`, `apply_type_code`, `apply_type_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`