From 32108939dcc9019c2072684c569879573e57d10a Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 2 Jul 2026 14:48:40 +0800 Subject: [PATCH] =?UTF-8?q?/compliance-check=20=E5=90=88=E8=A7=84=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rement-qual-filing-management-20260629.sql | 2 +- docs/db/init-v2.sql | 4 +- docs/db/数据库设计文档-v2.md | 4 +- .../web/QualFilingChangeController.java | 14 +- .../QualFilingChangeCmdConvertor.java | 22 +++ .../executor/QualFilingChangeExecutor.java | 116 ++++++++++++-- .../orchestrator/QualFilingOrchestrator.java | 14 +- .../client/api/QualFilingChangeApi.java | 7 +- .../QualFilingCommitmentChangeAddCmd.java | 8 +- .../QualFilingCommitmentChangePageQry.java | 6 +- .../QualFilingCommitmentChangeUpdateCmd.java | 8 +- .../QualFilingEquipmentChangeAddCmd.java | 8 +- .../QualFilingEquipmentChangePageQry.java | 6 +- .../QualFilingEquipmentChangeUpdateCmd.java | 8 +- .../QualFilingMaterialChangeAddCmd.java | 8 +- .../QualFilingMaterialChangePageQry.java | 6 +- .../QualFilingMaterialChangeUpdateCmd.java | 8 +- .../QualFilingPersonnelCertChangeAddCmd.java | 8 +- .../QualFilingPersonnelCertChangePageQry.java | 6 +- ...ualFilingPersonnelCertChangeUpdateCmd.java | 8 +- .../QualFilingPersonnelChangeAddCmd.java | 8 +- .../QualFilingPersonnelChangePageQry.java | 6 +- .../QualFilingPersonnelChangeUpdateCmd.java | 8 +- .../QualFilingCommitmentChangeCo.java | 6 +- .../response/QualFilingEquipmentChangeCo.java | 6 +- .../response/QualFilingMaterialChangeCo.java | 6 +- .../QualFilingPersonnelCertChangeCo.java | 6 +- .../response/QualFilingPersonnelChangeCo.java | 6 +- .../client/co/QualFilingChangeCO.java | 4 +- ...regationSaveOrEditQualFilingChangeCmd.java | 32 ++++ .../client/dto/QualFilingChangeAddCmd.java | 10 +- .../client/dto/QualFilingChangeModifyCmd.java | 4 +- .../client/dto/QualFilingChangePageQuery.java | 4 +- .../model/QualFilingCommitmentChangeE.java | 4 +- .../model/QualFilingEquipmentChangeE.java | 4 +- .../model/QualFilingMaterialChangeE.java | 4 +- .../model/QualFilingPersonnelCertChangeE.java | 4 +- .../model/QualFilingPersonnelChangeE.java | 4 +- .../domain/entity/QualFilingChangeEntity.java | 4 +- .../QualFilingChangeDetailGateway.java | 4 +- .../gateway/QualFilingChangeGateway.java | 13 +- .../domain/query/QualFilingChangeQuery.java | 4 +- .../QualFilingChangeDomainService.java | 21 +++ .../QualFilingChangeDoConvertor.java | 22 +++ ...lFilingPersonnelCertChangeDoConvertor.java | 14 ++ .../dataobject/QualFilingChangeDO.java | 2 +- .../QualFilingChangeDetailGatewayImpl.java | 8 +- .../QualFilingChangeGatewayImpl.java | 147 +++++++++++++++++- .../mapper/QualFilingChangeDetailMapper.java | 8 +- .../QualFilingCommitmentChangeDO.java | 4 +- .../QualFilingEquipmentChangeDO.java | 4 +- .../QualFilingMaterialChangeDO.java | 4 +- .../QualFilingPersonnelCertChangeDO.java | 4 +- .../QualFilingPersonnelChangeDO.java | 4 +- ...lFilingCommitmentChangeRepositoryImpl.java | 6 +- ...alFilingEquipmentChangeRepositoryImpl.java | 4 +- ...ualFilingMaterialChangeRepositoryImpl.java | 6 +- ...lingPersonnelCertChangeRepositoryImpl.java | 4 +- ...alFilingPersonnelChangeRepositoryImpl.java | 12 +- .../mapper/QualFilingChangeMapper.xml | 4 +- .../QualFilingCommitmentChangeMapper.xml | 4 +- .../QualFilingEquipmentChangeMapper.xml | 4 +- .../mapper/QualFilingMaterialChangeMapper.xml | 4 +- .../QualFilingPersonnelCertChangeMapper.xml | 4 +- .../QualFilingPersonnelChangeMapper.xml | 4 +- 65 files changed, 536 insertions(+), 184 deletions(-) create mode 100644 safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java create mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingChangeDoConvertor.java diff --git a/docs/db/increment-qual-filing-management-20260629.sql b/docs/db/increment-qual-filing-management-20260629.sql index b98ce793..c9ef4311 100644 --- a/docs/db/increment-qual-filing-management-20260629.sql +++ b/docs/db/increment-qual-filing-management-20260629.sql @@ -41,7 +41,7 @@ WHERE `apply_type_code` IN (1, 2, 3); -- 2. qual_filing_change 变更头表 -- --------------------------------------------- ALTER TABLE `qual_filing_change` - ADD COLUMN `change_filing_id` bigint DEFAULT NULL COMMENT '关联变更草稿qual_filing.id' AFTER `origin_filing_id`, + ADD COLUMN `change_filing_id` bigint DEFAULT NULL COMMENT '关联变更草稿qual_filing.id' AFTER `filing_id`, ADD COLUMN `reject_reason` varchar(500) DEFAULT NULL COMMENT '打回原因' AFTER `change_filing_id`, ADD COLUMN `submit_time` datetime DEFAULT NULL COMMENT '提交时间' AFTER `reject_reason`; diff --git a/docs/db/init-v2.sql b/docs/db/init-v2.sql index e8e15c6b..638bcd41 100644 --- a/docs/db/init-v2.sql +++ b/docs/db/init-v2.sql @@ -571,7 +571,7 @@ DROP TABLE IF EXISTS `qual_filing_change`; CREATE TABLE `qual_filing_change` ( `id` bigint NOT NULL COMMENT '主键', `org_id` bigint NOT NULL COMMENT '机构id', - `origin_filing_id` bigint NOT NULL COMMENT '原备案申请id', + `filing_id` bigint NOT NULL COMMENT '备案申请id', `change_filing_id` bigint DEFAULT NULL COMMENT '关联变更草稿qual_filing.id', `reject_reason` varchar(500) DEFAULT NULL COMMENT '打回原因', `submit_time` datetime DEFAULT NULL COMMENT '提交时间', @@ -611,7 +611,7 @@ CREATE TABLE `qual_filing_change` ( `env` varchar(50) DEFAULT NULL COMMENT '环境', PRIMARY KEY (`id`), KEY `idx_qual_filing_change_org_id` (`org_id`), - KEY `idx_qual_filing_change_origin_id` (`origin_filing_id`) + KEY `idx_qual_filing_change_filing_id` (`filing_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='备案变更表'; -- ---------------------------- diff --git a/docs/db/数据库设计文档-v2.md b/docs/db/数据库设计文档-v2.md index cb173945..6089a7cb 100644 --- a/docs/db/数据库设计文档-v2.md +++ b/docs/db/数据库设计文档-v2.md @@ -222,9 +222,9 @@ qual_filing (1) ── (N) qual_filing_change ── (N) qual_filing_change_deta ### 4.16 qual_filing_change — 备案变更表 -**作用：** 每次变更提交的快照头记录；`origin_filing_id` 关联原备案，`change_filing_id` 关联变更草稿 qual_filing。 +**作用：** 每次变更提交的快照头记录；`filing_id` 关联原备案，`change_filing_id` 关联变更草稿 qual_filing。 -**关联：** `origin_filing_id` → qual_filing.id +**关联：** `filing_id` → qual_filing.id --- diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index fec77e46..978863f4 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -58,8 +58,8 @@ public class QualFilingChangeController { @ApiOperation("发起备案变更（克隆草稿）") @PostMapping("/start") - public SingleResponse start(@ApiParam("原备案申请id") @RequestParam Long originFilingId) { - return qualFilingChangeApi.start(originFilingId); + public SingleResponse start(@ApiParam("备案申请id") @RequestParam Long filingId) { + return qualFilingChangeApi.start(filingId); } @ApiOperation("提交备案变更") @@ -71,8 +71,8 @@ public class QualFilingChangeController { @ApiOperation("备案变更历史") @GetMapping("/history") public SingleResponse history( - @ApiParam("原备案申请id") @RequestParam Long originFilingId) { - return qualFilingChangeApi.history(originFilingId); + @ApiParam("备案申请id") @RequestParam Long filingId) { + return qualFilingChangeApi.history(filingId); } @ApiOperation("变更审核通过") @@ -87,6 +87,12 @@ public class QualFilingChangeController { return qualFilingChangeApi.reject(cmd); } + @ApiOperation("聚合新增or编辑资质备案变更申请") + @PostMapping("/aggregationSaveOrEdit") + public SingleResponse aggregationSaveOrEdit(@RequestBody AggregationSaveOrEditQualFilingChangeCmd cmd) { + return qualFilingChangeApi.aggregationSaveOrEdit(cmd); + } + @ApiOperation("合规检查") @GetMapping("/compliance-check") public SingleResponse> complianceCheck(@ApiParam("主键ID") @RequestParam Long id) { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java new file mode 100644 index 00000000..c422d03c --- /dev/null +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java @@ -0,0 +1,22 @@ +package org.qinan.safetyeval.app.change.convertor; + +import org.mapstruct.Mapper; +import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; +import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; + +/** + * 备案变更基本信息命令转换 + * + * @author safety-eval + */ +@Mapper(componentModel = "spring") +public interface QualFilingChangeCmdConvertor { + + /** + * cmd_add转领域模型 + * + * @param qualFilingChangeAddCmd + * @return + */ + QualFilingChangeEntity convertCmdToE(QualFilingChangeAddCmd qualFilingChangeAddCmd); +} 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 486e5de4..33a8ca36 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 @@ -1,28 +1,30 @@ package org.qinan.safetyeval.app.executor; +import org.qinan.safetyeval.app.change.convertor.*; import org.qinan.safetyeval.app.orchestrator.QualFilingOrchestrator; import org.qinan.safetyeval.client.api.QualFilingChangeApi; import org.qinan.safetyeval.client.co.QualFilingChangeCO; import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingChangeModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingChangePageQuery; -import org.qinan.safetyeval.client.dto.QualFilingChangeSubmitCmd; -import org.qinan.safetyeval.client.dto.QualFilingRejectCmd; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.domain.change.model.*; +import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; -import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; +import org.qinan.safetyeval.domain.exception.BizException; +import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.query.PageResult; +import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** * 备案变更执行器（App层） @@ -36,11 +38,23 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { @Resource private QualFilingOrchestrator qualFilingOrchestrator; + @Resource + private QualFilingChangeCmdConvertor qualFilingChangeCmdConvertor; + @Resource + private QualFilingCommitmentChangeCmdConvertor qualFilingCommitmentChangeCmdConvertor; + @Resource + private QualFilingEquipmentChangeCmdConvertor qualFilingEquipmentChangeCmdConvertor; + @Resource + private QualFilingMaterialChangeCmdConvertor qualFilingMaterialChangeCmdConvertor; + @Resource + private QualFilingPersonnelChangeCmdConvertor qualFilingPersonnelChangeCmdConvertor; + @Resource + private QualFilingPersonnelCertChangeCmdConvertor qualFilingPersonnelCertChangeCmdConvertor; @Override public SingleResponse add(QualFilingChangeAddCmd cmd) { QualFilingChangeEntity entity = new QualFilingChangeEntity(); - entity.setOriginFilingId(cmd.getOriginFilingId()); + entity.setFilingId(cmd.getFilingId()); entity.setFilingTerritoryCode(cmd.getFilingTerritoryCode()); entity.setFilingTerritoryName(cmd.getFilingTerritoryName()); entity.setFilingUnitName(cmd.getFilingUnitName()); @@ -78,7 +92,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { public SingleResponse modify(QualFilingChangeModifyCmd cmd) { QualFilingChangeEntity entity = new QualFilingChangeEntity(); entity.setId(cmd.getId()); - entity.setOriginFilingId(cmd.getOriginFilingId()); + entity.setFilingId(cmd.getFilingId()); entity.setFilingTerritoryCode(cmd.getFilingTerritoryCode()); entity.setFilingTerritoryName(cmd.getFilingTerritoryName()); entity.setFilingUnitName(cmd.getFilingUnitName()); @@ -119,7 +133,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setOrgId(query.getOrgId()); - domainQuery.setOriginFilingId(query.getOriginFilingId()); + domainQuery.setFilingId(query.getFilingId()); domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); PageResult pageResult = qualFilingChangeDomainService.page(domainQuery); @@ -129,8 +143,8 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { } @Override - public SingleResponse start(Long originFilingId) { - return SingleResponse.success(qualFilingOrchestrator.startChange(originFilingId)); + public SingleResponse start(Long filingId) { + return SingleResponse.success(qualFilingOrchestrator.startChange(filingId)); } @Override @@ -140,8 +154,8 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { } @Override - public SingleResponse history(Long originFilingId) { - return SingleResponse.success(qualFilingOrchestrator.getChangeHistory(originFilingId)); + public SingleResponse history(Long filingId) { + return SingleResponse.success(qualFilingOrchestrator.getChangeHistory(filingId)); } @Override @@ -161,13 +175,83 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { return SingleResponse.success(qualFilingOrchestrator.complianceCheckChange(id)); } + @Override + public SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd) { + validateBeforeSaveOrEdit(cmd); + + QualFilingChangeCO co = new QualFilingChangeCO(); + + // 变更基本信息 + QualFilingChangeEntity entity = qualFilingChangeCmdConvertor.convertCmdToE(cmd.getQualFilingChangeAddCmd()); + + // 变更承诺书 + QualFilingCommitmentChangeE commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertCmdToE(cmd.getQualFilingCommitmentChangeAddCmd()); + + // 变更装备 + List equipmentEntities = cmd.getQualFilingEquipmentChangeAddCmds().stream() + .map(item -> qualFilingEquipmentChangeCmdConvertor.convertCmdToE(item)) + .collect(Collectors.toList()); + + // 变更材料 + List materialEntities = cmd.getQualFilingMaterialChangeAddCmds().stream() + .map(item -> qualFilingMaterialChangeCmdConvertor.convertCmdToE(item)) + .collect(Collectors.toList()); + + // 变更人员 + List personnelEntities = cmd.getQualFilingPersonnelChangeAddCmds().stream() + .map(item -> qualFilingPersonnelChangeCmdConvertor.convertCmdToE(item)) + .collect(Collectors.toList()); + + // 变更人员证书 + List personnelCertEntities = Collections.emptyList(); + if (!CollectionUtils.isEmpty(cmd.getQualFilingPersonnelCertChangeAddCmds())) { + personnelCertEntities = cmd.getQualFilingPersonnelCertChangeAddCmds().stream() + .map(item -> qualFilingPersonnelCertChangeCmdConvertor.convertCmdToE(item)) + .collect(Collectors.toList()); + } + + Long id = qualFilingChangeDomainService.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + co.setId(id); + return SingleResponse.success(co); + } + + /** + * 聚合保存或编辑前的状态校验 + *
    + *
  • 新增：根据filingId统计qualFilingChange表中filingStatusCode != 1(已备案)的记录数，有则不允许新增
    • + *
  • 修改：根据id查询变更记录，filingStatusCode = 1(已备案) 则不允许修改
    • + *
+ */ + private void validateBeforeSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd) { + QualFilingChangeAddCmd addCmd = cmd.getQualFilingChangeAddCmd(); + if (addCmd.getId() == null) { + cmd.setAdd(true); + // 新增：根据filingId统计qualFilingChange表中filingStatusCode != 1的记录数，有则不允许新增 + int count = qualFilingChangeDomainService.countByFilingIdAndStatusNot( + addCmd.getFilingId(), QualFilingStatusEnum.FILED.getCode()); + if (count > 0) { + throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID, "存在进行中的备案变更，不允许新增"); + } + } else { + cmd.setAdd(false); + // 修改：根据id查询变更记录，filing_status_code = 1 则不允许修改 + QualFilingChangeEntity existing = qualFilingChangeDomainService.get(addCmd.getId()); + if (existing == null) { + throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); + } + if (QualFilingStatusEnum.isFiled(existing.getFilingStatusCode())) { + throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID, "已备案的变更记录不允许修改"); + } + } + } + private QualFilingChangeCO toCO(QualFilingChangeEntity entity) { if (entity == null) { return null; } QualFilingChangeCO co = new QualFilingChangeCO(); co.setId(entity.getId()); - co.setOriginFilingId(entity.getOriginFilingId()); + co.setFilingId(entity.getFilingId()); co.setChangeFilingId(entity.getChangeFilingId()); co.setFilingTerritoryCode(entity.getFilingTerritoryCode()); co.setFilingTerritoryName(entity.getFilingTerritoryName()); 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 6729ebe7..c9d55d32 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 @@ -220,7 +220,7 @@ public class QualFilingOrchestrator { && entity.getApplyTypeCode() == QualFilingApplyTypeEnum.CHANGE_DRAFT.getCode() && entity.getOriginFilingId() != null ? entity.getOriginFilingId() : entity.getId(); - co.setChangeCount(qualFilingChangeDetailGateway.countByOriginFilingId(originId)); + co.setChangeCount(qualFilingChangeDetailGateway.countByFilingId(originId)); return co; }) .collect(Collectors.toList()); @@ -340,7 +340,7 @@ public class QualFilingOrchestrator { throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); } QualFilingEntity draft = qualFilingGateway.get(change.getChangeFilingId()); - QualFilingEntity origin = qualFilingGateway.get(change.getOriginFilingId()); + QualFilingEntity origin = qualFilingGateway.get(change.getFilingId()); applyDraftToOrigin(origin, draft); replaceChildrenFromDraft(origin.getId(), draft.getId()); origin.setFilingStatusCode(QualFilingStatusEnum.FILED.getCode()); @@ -359,7 +359,7 @@ public class QualFilingOrchestrator { if (change == null) { throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); } - QualFilingEntity origin = qualFilingGateway.get(change.getOriginFilingId()); + QualFilingEntity origin = qualFilingGateway.get(change.getFilingId()); origin.setFilingStatusCode(QualFilingStatusEnum.REJECTED.getCode()); origin.setFilingStatusName(QualFilingStatusEnum.REJECTED.getName()); origin.setRejectReason(rejectReason); @@ -371,11 +371,11 @@ public class QualFilingOrchestrator { qualFilingChangeGateway.modify(change); } - public QualFilingChangeHistoryCO getChangeHistory(Long originFilingId) { + public QualFilingChangeHistoryCO getChangeHistory(Long filingId) { QualFilingChangeHistoryCO history = new QualFilingChangeHistoryCO(); - int count = qualFilingChangeDetailGateway.countByOriginFilingId(originFilingId); + int count = qualFilingChangeDetailGateway.countByFilingId(filingId); history.setChangeCount(count); - history.setRecords(qualFilingChangeDetailGateway.listByOriginFilingId(originFilingId).stream() + history.setRecords(qualFilingChangeDetailGateway.listByFilingId(filingId).stream() .map(this::toHistoryItem) .collect(Collectors.toList())); return history; @@ -523,7 +523,7 @@ public class QualFilingOrchestrator { private QualFilingChangeEntity copyToChangeHeader(QualFilingEntity origin, QualFilingEntity draft) { QualFilingChangeEntity change = new QualFilingChangeEntity(); change.setOrgId(origin.getOrgId()); - change.setOriginFilingId(origin.getId()); + change.setFilingId(origin.getId()); change.setFilingTerritoryCode(draft.getFilingTerritoryCode()); change.setFilingTerritoryName(draft.getFilingTerritoryName()); change.setFilingUnitName(draft.getFilingUnitName()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java index 8f680cfd..63078ee3 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.api; import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO; import org.qinan.safetyeval.client.co.QualFilingChangeCO; +import org.qinan.safetyeval.client.dto.AggregationSaveOrEditQualFilingChangeCmd; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; @@ -28,15 +29,17 @@ public interface QualFilingChangeApi { PageResponse page(QualFilingChangePageQuery query); - SingleResponse start(Long originFilingId); + SingleResponse start(Long filingId); SingleResponse submit(QualFilingChangeSubmitCmd cmd); - SingleResponse history(Long originFilingId); + SingleResponse history(Long filingId); SingleResponse approve(Long changeId); SingleResponse reject(QualFilingRejectCmd cmd); SingleResponse> complianceCheck(Long id); + + SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java index a8c96f56..dfbd3850 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java @@ -18,11 +18,11 @@ public class QualFilingCommitmentChangeAddCmd implements Serializable { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 承诺内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java index 4dedf608..62bc2ff0 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java @@ -17,10 +17,10 @@ public class QualFilingCommitmentChangePageQry extends PageQuery { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 承诺内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java index 271f060a..07528944 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java @@ -20,11 +20,11 @@ public class QualFilingCommitmentChangeUpdateCmd implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 承诺内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java index 6cd30391..710c61d9 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java @@ -19,11 +19,11 @@ public class QualFilingEquipmentChangeAddCmd implements Serializable { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 来源装备id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangePageQry.java index 9737828a..cfa16678 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangePageQry.java @@ -17,10 +17,10 @@ public class QualFilingEquipmentChangePageQry extends PageQuery { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 来源装备id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java index 4a05bc7c..b7cf20bd 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java @@ -21,11 +21,11 @@ public class QualFilingEquipmentChangeUpdateCmd implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 来源装备id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java index a6dda926..052a9e7f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java @@ -18,11 +18,11 @@ public class QualFilingMaterialChangeAddCmd implements Serializable { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java index 385fdb80..64c8fcb4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java @@ -15,10 +15,10 @@ public class QualFilingMaterialChangePageQry extends PageQuery { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java index a18d43cb..cd6fb069 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java @@ -20,11 +20,11 @@ public class QualFilingMaterialChangeUpdateCmd implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java index f02f39b1..fa1137b1 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java @@ -18,11 +18,11 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 备案人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java index 4a957251..055eedec 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java @@ -17,10 +17,10 @@ public class QualFilingPersonnelCertChangePageQry extends PageQuery { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 备案人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java index 5b84d709..24e6a04a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java @@ -20,11 +20,11 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 备案人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java index 5f88a057..26ca20a4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java @@ -19,11 +19,11 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 来源人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java index d6b73f2f..be60ab31 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java @@ -17,10 +17,10 @@ public class QualFilingPersonnelChangePageQry extends PageQuery { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 来源人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java index bd1d01b1..cd885573 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java @@ -21,11 +21,11 @@ public class QualFilingPersonnelChangeUpdateCmd implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id", required = true) - @NotNull(message = "备案申请id不能为空") - private Long filingId; + @ApiModelProperty(value = "备案变更id", required = true) + @NotNull(message = "备案变更id不能为空") + private Long filingChangeId; /** * 来源人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingCommitmentChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingCommitmentChangeCo.java index ae1d01f8..0554346e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingCommitmentChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingCommitmentChangeCo.java @@ -19,10 +19,10 @@ public class QualFilingCommitmentChangeCo extends ClientObject { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 承诺内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java index 12128431..604c050d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java @@ -19,10 +19,10 @@ public class QualFilingEquipmentChangeCo extends ClientObject { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 来源装备id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java index 110c918c..8e1eb462 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java @@ -17,10 +17,10 @@ public class QualFilingMaterialChangeCo extends ClientObject { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java index 790af49f..0bd8a8db 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java @@ -19,10 +19,10 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 备案人员id */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java index 9e702c88..495cde0d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java @@ -19,10 +19,10 @@ public class QualFilingPersonnelChangeCo extends ClientObject { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** - * 备案申请id + * 备案变更id */ - @ApiModelProperty(value = "备案申请id") - private Long filingId; + @ApiModelProperty(value = "备案变更id") + private Long filingChangeId; /** * 来源人员id */ 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 5f939f67..8c2c6081 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 @@ -15,8 +15,8 @@ public class QualFilingChangeCO { @ApiModelProperty(value = "主键ID") private Long id; - @ApiModelProperty(value = "原始备案ID") - private Long originFilingId; + @ApiModelProperty(value = "备案申请ID") + private Long filingId; @ApiModelProperty(value = "变更备案ID") private Long changeFilingId; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java new file mode 100644 index 00000000..1548a02c --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java @@ -0,0 +1,32 @@ +package org.qinan.safetyeval.client.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.qinan.safetyeval.client.change.request.*; + +import java.util.List; + +@Data +public class AggregationSaveOrEditQualFilingChangeCmd { + + @ApiModelProperty(hidden = true, value = "是否变更新增") + private boolean add; + + @ApiModelProperty(value = "基本信息") + private QualFilingChangeAddCmd qualFilingChangeAddCmd; + + @ApiModelProperty(value = "备案承诺书") + private QualFilingCommitmentChangeAddCmd qualFilingCommitmentChangeAddCmd; + + @ApiModelProperty(value = "备案装备") + private List qualFilingEquipmentChangeAddCmds; + + @ApiModelProperty(value = "备案材料清单") + private List qualFilingMaterialChangeAddCmds; + + @ApiModelProperty(value = "备案人员") + private List qualFilingPersonnelChangeAddCmds; + + @ApiModelProperty(value = "备案人员证书列表") + private List qualFilingPersonnelCertChangeAddCmds; +} 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 7eaef703..e4dfd8fb 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 @@ -12,8 +12,14 @@ import lombok.Data; @Data public class QualFilingChangeAddCmd { - @ApiModelProperty(value = "原备案申请id") - private Long originFilingId; + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "备案申请id") + private Long filingId; + + @ApiModelProperty(value = "关联变更的id") + private Long changeFilingId; @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; 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 b6644599..f8744487 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 @@ -15,8 +15,8 @@ public class QualFilingChangeModifyCmd { @ApiModelProperty(value = "主键ID") private Long id; - @ApiModelProperty(value = "原备案申请id") - private Long originFilingId; + @ApiModelProperty(value = "备案申请id") + private Long filingId; @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; 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 d51e4775..2c018138 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,8 +16,8 @@ public class QualFilingChangePageQuery extends BasePageQuery { @ApiModelProperty(value = "单位id") private Long orgId; - @ApiModelProperty(value = "原备案申请id") - private Long originFilingId; + @ApiModelProperty(value = "备案申请id") + private Long filingId; @ApiModelProperty(value = "备案编号") private String filingNo; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingCommitmentChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingCommitmentChangeE.java index 3468ff2a..88c51c56 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingCommitmentChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingCommitmentChangeE.java @@ -23,9 +23,9 @@ public class QualFilingCommitmentChangeE extends BaseE { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 承诺内容 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java index 6e1ff39d..4e7c74f7 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java @@ -23,9 +23,9 @@ public class QualFilingEquipmentChangeE extends BaseE { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 来源装备id */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java index c849baf1..f691575d 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java @@ -21,9 +21,9 @@ public class QualFilingMaterialChangeE extends BaseE { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java index 03bb3d9e..7a10a749 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java @@ -23,9 +23,9 @@ public class QualFilingPersonnelCertChangeE extends BaseE { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 备案人员id */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java index 39877278..644e113f 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java @@ -23,9 +23,9 @@ public class QualFilingPersonnelChangeE extends BaseE { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 来源人员id */ 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 3cf5ac15..897de595 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 @@ -18,8 +18,8 @@ public class QualFilingChangeEntity { /** 机构ID */ private Long orgId; - /** 原备案申请ID */ - private Long originFilingId; + /** 备案申请ID */ + private Long filingId; /** 关联变更草稿ID */ private Long changeFilingId; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeDetailGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeDetailGateway.java index ae955aa5..745349e8 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeDetailGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeDetailGateway.java @@ -18,9 +18,9 @@ public interface QualFilingChangeDetailGateway { List listByChangeId(Long changeId); - List listByOriginFilingId(Long originFilingId); + List listByFilingId(Long filingId); - int countByOriginFilingId(Long originFilingId); + int countByFilingId(Long filingId); QualFilingChangeDetailEntity modify(QualFilingChangeDetailEntity entity); diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeGateway.java index a047681d..91fbfb75 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeGateway.java @@ -1,5 +1,10 @@ package org.qinan.safetyeval.domain.gateway; +import org.qinan.safetyeval.domain.change.model.QualFilingCommitmentChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingEquipmentChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingMaterialChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.query.PageResult; @@ -16,11 +21,17 @@ public interface QualFilingChangeGateway { QualFilingChangeEntity get(Long id); - List listByOriginFilingId(Long originFilingId); + List listByFilingId(Long filingId); + + int countByFilingIdAndStatusNot(Long filingId, Integer excludeStatusCode); QualFilingChangeEntity modify(QualFilingChangeEntity entity); void delete(Long id); PageResult page(QualFilingChangeQuery query); + + Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity, + List equipmentEntities, List materialEntities, + List personnelEntities, List personnelCertEntities); } 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 1be6f4b7..70c41d23 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 @@ -22,8 +22,8 @@ public class QualFilingChangeQuery { /** 机构ID */ private Long orgId; - /** 原备案ID */ - private Long originFilingId; + /** 备案申请ID */ + private Long filingId; /** 备案编号 */ private String filingNo; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingChangeDomainService.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingChangeDomainService.java index 8407f00d..4aff4493 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingChangeDomainService.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingChangeDomainService.java @@ -1,5 +1,10 @@ package org.qinan.safetyeval.domain.service; +import org.qinan.safetyeval.domain.change.model.QualFilingCommitmentChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingEquipmentChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingMaterialChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE; +import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; @@ -7,6 +12,8 @@ import org.qinan.safetyeval.domain.gateway.QualFilingChangeGateway; import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.query.PageResult; +import java.util.List; + import javax.annotation.Resource; import org.springframework.stereotype.Service; @@ -29,6 +36,14 @@ public class QualFilingChangeDomainService { return qualFilingChangeGateway.get(id); } + public List listByFilingId(Long filingId) { + return qualFilingChangeGateway.listByFilingId(filingId); + } + + public int countByFilingIdAndStatusNot(Long filingId, Integer excludeStatusCode) { + return qualFilingChangeGateway.countByFilingIdAndStatusNot(filingId, excludeStatusCode); + } + public QualFilingChangeEntity modify(QualFilingChangeEntity entity) { QualFilingChangeEntity existing = qualFilingChangeGateway.get(entity.getId()); if (existing == null) { @@ -48,4 +63,10 @@ public class QualFilingChangeDomainService { public PageResult page(QualFilingChangeQuery query) { return qualFilingChangeGateway.page(query); } + + public Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity, + List equipmentEntities, List materialEntities, + List personnelEntities, List personnelCertEntities) { + return qualFilingChangeGateway.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingChangeDoConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingChangeDoConvertor.java new file mode 100644 index 00000000..192d43de --- /dev/null +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingChangeDoConvertor.java @@ -0,0 +1,22 @@ +package org.qinan.safetyeval.infrastructure.convertor; + +import org.mapstruct.Mapper; +import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; +import org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeDO; + +/** + * 备案变更基本信息DO对象转换 + * + * @author safety-eval + */ +@Mapper(componentModel = "spring") +public interface QualFilingChangeDoConvertor { + + /** + * 领域对象转DO + * + * @param qualFilingChangeEntity + * @return + */ + QualFilingChangeDO convertEeToDo(QualFilingChangeEntity qualFilingChangeEntity); +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingPersonnelCertChangeDoConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingPersonnelCertChangeDoConvertor.java index 72cf4020..4d73e17a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingPersonnelCertChangeDoConvertor.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingPersonnelCertChangeDoConvertor.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.infrastructure.convertor; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangePageQry; import org.qinan.safetyeval.client.change.response.QualFilingPersonnelCertChangeCo; import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE; +import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelCertDO; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingPersonnelCertChangeDO; import java.util.List; @@ -50,4 +52,16 @@ public interface QualFilingPersonnelCertChangeDoConvertor { * @return */ List converDosToCos(List qualFilingPersonnelCertChangeDos); + + /** + * OrgPersonnelCertDO转QualFilingPersonnelCertChangeDO + * + * @param orgPersonnelCertDO + * @return + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "filingChangeId", ignore = true) + @Mapping(target = "filingPersonnelId", source = "personnelId") + @Mapping(target = "sourceCertId", source = "id") + QualFilingPersonnelCertChangeDO convertOrgDoToChangeDo(OrgPersonnelCertDO orgPersonnelCertDO); } 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 b4a4dd72..96f144e0 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 @@ -17,7 +17,7 @@ public class QualFilingChangeDO { private Long id; private Long orgId; - private Long originFilingId; + private Long filingId; private Long changeFilingId; private String rejectReason; private LocalDateTime submitTime; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeDetailGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeDetailGatewayImpl.java index 905c0113..66f31800 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeDetailGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeDetailGatewayImpl.java @@ -52,14 +52,14 @@ public class QualFilingChangeDetailGatewayImpl implements QualFilingChangeDetail } @Override - public List listByOriginFilingId(Long originFilingId) { - List dataObjects = qualFilingChangeDetailMapper.selectByOriginFilingId(originFilingId); + public List listByFilingId(Long filingId) { + List dataObjects = qualFilingChangeDetailMapper.selectByFilingId(filingId); return dataObjects.stream().map(this::toEntity).collect(Collectors.toList()); } @Override - public int countByOriginFilingId(Long originFilingId) { - return qualFilingChangeDetailMapper.countByOriginFilingId(originFilingId); + public int countByFilingId(Long filingId) { + return qualFilingChangeDetailMapper.countByFilingId(filingId); } @Override 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 a3dd1c00..ad92e509 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 @@ -3,18 +3,29 @@ package org.qinan.safetyeval.infrastructure.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.qinan.safetyeval.domain.change.model.*; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; +import org.qinan.safetyeval.domain.exception.BizException; +import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.QualFilingChangeGateway; -import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.query.PageResult; +import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; +import org.qinan.safetyeval.infrastructure.convertor.*; +import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelCertDO; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeDO; +import org.qinan.safetyeval.infrastructure.mapper.OrgPersonnelCertMapper; import org.qinan.safetyeval.infrastructure.mapper.QualFilingChangeMapper; +import org.qinan.safetyeval.infrastructure.persistence.domainobject.*; +import org.qinan.safetyeval.infrastructure.persistence.mapper.*; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -27,6 +38,30 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { @Resource private QualFilingChangeMapper qualFilingChangeMapper; + @Resource + private QualFilingCommitmentChangeMapper qualFilingCommitmentChangeMapper; + @Resource + private QualFilingEquipmentChangeMapper qualFilingEquipmentChangeMapper; + @Resource + private QualFilingMaterialChangeMapper qualFilingMaterialChangeMapper; + @Resource + private QualFilingPersonnelChangeMapper qualFilingPersonnelChangeMapper; + @Resource + private QualFilingPersonnelCertChangeMapper qualFilingPersonnelCertChangeMapper; + @Resource + private OrgPersonnelCertMapper orgPersonnelCertMapper; + @Resource + private QualFilingChangeDoConvertor qualFilingChangeDoConvertor; + @Resource + private QualFilingCommitmentChangeDoConvertor qualFilingCommitmentChangeDoConvertor; + @Resource + private QualFilingEquipmentChangeDoConvertor qualFilingEquipmentChangeDoConvertor; + @Resource + private QualFilingMaterialChangeDoConvertor qualFilingMaterialChangeDoConvertor; + @Resource + private QualFilingPersonnelChangeDoConvertor qualFilingPersonnelChangeDoConvertor; + @Resource + private QualFilingPersonnelCertChangeDoConvertor qualFilingPersonnelCertChangeDoConvertor; @Override public QualFilingChangeEntity save(QualFilingChangeEntity entity) { @@ -42,15 +77,24 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { QualFilingChangeDO dataObject = qualFilingChangeMapper.selectById(id); return toEntity(dataObject); } -@Override - public List listByOriginFilingId(Long originFilingId) { + + @Override + public List listByFilingId(Long filingId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(QualFilingChangeDO::getOriginFilingId, originFilingId); + wrapper.eq(QualFilingChangeDO::getFilingId, filingId); wrapper.eq(QualFilingChangeDO::getDeleteEnum, "false"); List dataObjects = qualFilingChangeMapper.selectList(wrapper); return dataObjects.stream().map(this::toEntity).collect(Collectors.toList()); } + @Override + public int countByFilingIdAndStatusNot(Long filingId, Integer excludeStatusCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(QualFilingChangeDO::getFilingId, filingId); + wrapper.ne(QualFilingChangeDO::getFilingStatusCode, excludeStatusCode); + return qualFilingChangeMapper.selectCount(wrapper).intValue(); + } + @Override public QualFilingChangeEntity modify(QualFilingChangeEntity entity) { QualFilingChangeDO dataObject = toDO(entity); @@ -72,8 +116,8 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { if (query.getOrgId() != null) { wrapper.eq(QualFilingChangeDO::getOrgId, query.getOrgId()); } - if (query.getOriginFilingId() != null) { - wrapper.eq(QualFilingChangeDO::getOriginFilingId, query.getOriginFilingId()); + if (query.getFilingId() != null) { + wrapper.eq(QualFilingChangeDO::getFilingId, query.getFilingId()); } if (StringUtils.hasText(query.getFilingNo())) { wrapper.eq(QualFilingChangeDO::getFilingNo, query.getFilingNo()); @@ -92,9 +136,96 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { return PageResult.of(entities, result.getTotal(), result.getCurrent(), result.getSize()); } + @Override + @Transactional(rollbackFor = Exception.class) + public Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity + , List equipmentEntities, List materialEntities + , List personnelEntities, List personnelCertEntities) { + //保存基础信息 + QualFilingChangeDO dataObject = qualFilingChangeDoConvertor.convertEeToDo(entity); + if (Objects.nonNull(dataObject.getId())) { + // 编辑 + qualFilingChangeMapper.updateById(dataObject); + } else { + qualFilingChangeMapper.insert(dataObject); + } + if (Objects.isNull(dataObject.getId())) { + throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); + } + + qualFilingCommitmentChangeMapper.delete(new LambdaQueryWrapper() + .eq(QualFilingCommitmentChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + qualFilingMaterialChangeMapper.delete(new LambdaQueryWrapper() + .eq(QualFilingMaterialChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + qualFilingEquipmentChangeMapper.delete(new LambdaQueryWrapper() + .eq(QualFilingEquipmentChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + + qualFilingPersonnelCertChangeMapper.delete(new LambdaQueryWrapper() + .eq(QualFilingPersonnelCertChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + qualFilingPersonnelChangeMapper.delete(new LambdaQueryWrapper() + .eq(QualFilingPersonnelChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + + //备案承诺书 + QualFilingCommitmentChangeDO commitmentDataObject = qualFilingCommitmentChangeDoConvertor.convertEeToDo(commitmentEntity); + InsertFieldDefaults.apply(commitmentDataObject); + commitmentDataObject.setFilingChangeId(dataObject.getId()); + qualFilingCommitmentChangeMapper.insert(commitmentDataObject); + //备案装备 + equipmentEntities.stream().map(item -> { + QualFilingEquipmentChangeDO equipmentDataObject = qualFilingEquipmentChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(equipmentDataObject); + equipmentDataObject.setFilingChangeId(dataObject.getId()); + return equipmentDataObject; + }).collect(Collectors.toList()).forEach( + equipmentDataObject -> qualFilingEquipmentChangeMapper.insert(equipmentDataObject)); + //备案材料 + materialEntities.stream().map(item -> { + QualFilingMaterialChangeDO materialDataObject = qualFilingMaterialChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(materialDataObject); + materialDataObject.setFilingChangeId(dataObject.getId()); + return materialDataObject; + }).collect(Collectors.toList()).forEach( + materialDataObject -> qualFilingMaterialChangeMapper.insert(materialDataObject)); + //备案人员 + personnelEntities.stream().map(item -> { + QualFilingPersonnelChangeDO personnelDataObject = qualFilingPersonnelChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(personnelDataObject); + personnelDataObject.setFilingChangeId(dataObject.getId()); + return personnelDataObject; + }).collect(Collectors.toList()).forEach( + personnelDataObject -> qualFilingPersonnelChangeMapper.insert(personnelDataObject)); + //备案人员证书 + if (CollectionUtils.isEmpty(personnelCertEntities)) { + List sourcePersonnelIds = personnelEntities + .stream().map(QualFilingPersonnelChangeE::getSourcePersonnelId).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(sourcePersonnelIds)) { + List orgPersonnelCertDOS = orgPersonnelCertMapper.selectList(new LambdaQueryWrapper() + .eq(OrgPersonnelCertDO::getPersonnelId, sourcePersonnelIds)); + if (!CollectionUtils.isEmpty(orgPersonnelCertDOS)) { + for (OrgPersonnelCertDO orgPersonnelCertDO : orgPersonnelCertDOS) { + QualFilingPersonnelCertChangeDO qualFilingPersonnelCertChangeDO = + qualFilingPersonnelCertChangeDoConvertor.convertOrgDoToChangeDo(orgPersonnelCertDO); + InsertFieldDefaults.apply(qualFilingPersonnelCertChangeDO); + qualFilingPersonnelCertChangeDO.setFilingChangeId(dataObject.getId()); + qualFilingPersonnelCertChangeMapper.insert(qualFilingPersonnelCertChangeDO); + } + } + } + } else { + personnelCertEntities.stream().map(item -> { + QualFilingPersonnelCertChangeDO personnelCertDataObject = qualFilingPersonnelCertChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(personnelCertDataObject); + personnelCertDataObject.setFilingChangeId(dataObject.getId()); + return personnelCertDataObject; + }).collect(Collectors.toList()).forEach( + personnelCertDataObject -> qualFilingPersonnelCertChangeMapper.insert(personnelCertDataObject)); + } + return dataObject.getId(); + } + private QualFilingChangeDO toDO(QualFilingChangeEntity entity) { QualFilingChangeDO dataObject = new QualFilingChangeDO(); - dataObject.setOriginFilingId(entity.getOriginFilingId()); + dataObject.setFilingId(entity.getFilingId()); dataObject.setChangeFilingId(entity.getChangeFilingId()); dataObject.setRejectReason(entity.getRejectReason()); dataObject.setSubmitTime(entity.getSubmitTime()); @@ -131,7 +262,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { } QualFilingChangeEntity entity = new QualFilingChangeEntity(); entity.setId(dataObject.getId()); - entity.setOriginFilingId(dataObject.getOriginFilingId()); + entity.setFilingId(dataObject.getFilingId()); entity.setChangeFilingId(dataObject.getChangeFilingId()); entity.setRejectReason(dataObject.getRejectReason()); entity.setSubmitTime(dataObject.getSubmitTime()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingChangeDetailMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingChangeDetailMapper.java index 4858d9f5..00295e04 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingChangeDetailMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingChangeDetailMapper.java @@ -14,12 +14,12 @@ public interface QualFilingChangeDetailMapper extends BaseMapper selectByOriginFilingId(@Param("originFilingId") Long originFilingId); + List selectByFilingId(@Param("filingId") Long filingId); @Select("SELECT COUNT(1) FROM qual_filing_change_detail d " + "INNER JOIN qual_filing_change c ON d.change_id = c.id " - + "WHERE c.origin_filing_id = #{originFilingId} AND d.delete_enum = 'false' AND c.delete_enum = 'false'") - int countByOriginFilingId(@Param("originFilingId") Long originFilingId); + + "WHERE c.filing_id = #{filingId} AND d.delete_enum = 'false' AND c.delete_enum = 'false'") + int countByFilingId(@Param("filingId") Long filingId); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java index 8a447969..740cc999 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java @@ -21,9 +21,9 @@ public class QualFilingCommitmentChangeDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 承诺内容 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java index f113aafb..2de8b6a0 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java @@ -20,9 +20,9 @@ public class QualFilingEquipmentChangeDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 来源装备id */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java index 907f94c1..3747f1cc 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java @@ -18,9 +18,9 @@ public class QualFilingMaterialChangeDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java index 0cc4efca..a9252d1c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java @@ -21,9 +21,9 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 备案人员id */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java index 822a2929..967aac12 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java @@ -21,9 +21,9 @@ public class QualFilingPersonnelChangeDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 备案申请id + * 备案变更id */ - private Long filingId; + private Long filingChangeId; /** * 来源人员id */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java index 2c2f6a09..5be3fd45 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java @@ -34,8 +34,8 @@ public class QualFilingCommitmentChangeRepositoryImpl extends BaseRepositoryImpl @Override public IPage listQualFilingCommitmentChangePage(IPage iPage, QualFilingCommitmentChangePageQry qualFilingCommitmentChangePageQry) { QueryWrapper qualFilingCommitmentChangeDoQueryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(qualFilingCommitmentChangePageQry.getFilingId())) { - qualFilingCommitmentChangeDoQueryWrapper.eq("filing_id", qualFilingCommitmentChangePageQry.getFilingId()); + if (ObjectUtil.isNotEmpty(qualFilingCommitmentChangePageQry.getFilingChangeId())) { + qualFilingCommitmentChangeDoQueryWrapper.eq("filing_change_id", qualFilingCommitmentChangePageQry.getFilingChangeId()); } if (ObjectUtil.isNotEmpty(qualFilingCommitmentChangePageQry.getCommitmentContent())) { qualFilingCommitmentChangeDoQueryWrapper.eq("commitment_content", qualFilingCommitmentChangePageQry.getCommitmentContent()); @@ -82,7 +82,7 @@ public class QualFilingCommitmentChangeRepositoryImpl extends BaseRepositoryImpl @Override public QualFilingCommitmentChangeDO getByFilingId(Long filingId) { return super.lambdaQuery() - .eq(QualFilingCommitmentChangeDO::getFilingId, filingId) + .eq(QualFilingCommitmentChangeDO::getFilingChangeId, filingId) .eq(QualFilingCommitmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) .one(); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java index 3935cbf8..b0bb2926 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java @@ -34,8 +34,8 @@ public class QualFilingEquipmentChangeRepositoryImpl extends BaseRepositoryImpl< @Override public IPage listQualFilingEquipmentChangePage(IPage iPage, QualFilingEquipmentChangePageQry qualFilingEquipmentChangePageQry) { QueryWrapper qualFilingEquipmentChangeDoQueryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(qualFilingEquipmentChangePageQry.getFilingId())) { - qualFilingEquipmentChangeDoQueryWrapper.eq("filing_id", qualFilingEquipmentChangePageQry.getFilingId()); + if (ObjectUtil.isNotEmpty(qualFilingEquipmentChangePageQry.getFilingChangeId())) { + qualFilingEquipmentChangeDoQueryWrapper.eq("filing_change_id", qualFilingEquipmentChangePageQry.getFilingChangeId()); } if (ObjectUtil.isNotEmpty(qualFilingEquipmentChangePageQry.getSourceEquipmentId())) { qualFilingEquipmentChangeDoQueryWrapper.eq("source_equipment_id", qualFilingEquipmentChangePageQry.getSourceEquipmentId()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java index 816a6e7d..8c0b9738 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java @@ -34,8 +34,8 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl listQualFilingMaterialChangePage(IPage iPage, QualFilingMaterialChangePageQry qualFilingMaterialChangePageQry) { QueryWrapper qualFilingMaterialChangeDoQueryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(qualFilingMaterialChangePageQry.getFilingId())) { - qualFilingMaterialChangeDoQueryWrapper.eq("filing_id", qualFilingMaterialChangePageQry.getFilingId()); + if (ObjectUtil.isNotEmpty(qualFilingMaterialChangePageQry.getFilingChangeId())) { + qualFilingMaterialChangeDoQueryWrapper.eq("filing_change_id", qualFilingMaterialChangePageQry.getFilingChangeId()); } if (ObjectUtil.isNotEmpty(qualFilingMaterialChangePageQry.getMaterialType())) { qualFilingMaterialChangeDoQueryWrapper.eq("material_type", qualFilingMaterialChangePageQry.getMaterialType()); @@ -97,7 +97,7 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl listQualFilingPersonnelCertChangePage(IPage iPage, QualFilingPersonnelCertChangePageQry qualFilingPersonnelCertChangePageQry) { QueryWrapper qualFilingPersonnelCertChangeDoQueryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getFilingId())) { - qualFilingPersonnelCertChangeDoQueryWrapper.eq("filing_id", qualFilingPersonnelCertChangePageQry.getFilingId()); + if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getFilingChangeId())) { + qualFilingPersonnelCertChangeDoQueryWrapper.eq("filing_change_id", qualFilingPersonnelCertChangePageQry.getFilingChangeId()); } if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getFilingPersonnelId())) { qualFilingPersonnelCertChangeDoQueryWrapper.eq("filing_personnel_id", qualFilingPersonnelCertChangePageQry.getFilingPersonnelId()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java index cbc69fb9..ffe2cffb 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java @@ -34,8 +34,8 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public IPage listQualFilingPersonnelChangePage(IPage iPage, QualFilingPersonnelChangePageQry qualFilingPersonnelChangePageQry) { QueryWrapper qualFilingPersonnelChangeDoQueryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getFilingId())) { - qualFilingPersonnelChangeDoQueryWrapper.eq("filing_id", qualFilingPersonnelChangePageQry.getFilingId()); + if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getFilingChangeId())) { + qualFilingPersonnelChangeDoQueryWrapper.eq("filing_change_id", qualFilingPersonnelChangePageQry.getFilingChangeId()); } if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getSourcePersonnelId())) { qualFilingPersonnelChangeDoQueryWrapper.eq("source_personnel_id", qualFilingPersonnelChangePageQry.getSourcePersonnelId()); @@ -139,7 +139,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public java.util.List listByFilingId(Long filingId) { return super.lambdaQuery() - .eq(QualFilingPersonnelChangeDO::getFilingId, filingId) + .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) .list(); } @@ -147,7 +147,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public int countByFilingId(Long filingId) { return super.lambdaQuery() - .eq(QualFilingPersonnelChangeDO::getFilingId, filingId) + .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) .count().intValue(); } @@ -155,7 +155,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public int countByFilingIdAndRegisterEngineerFlag(Long filingId, Integer registerEngineerFlag) { return super.lambdaQuery() - .eq(QualFilingPersonnelChangeDO::getFilingId, filingId) + .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) .eq(QualFilingPersonnelChangeDO::getRegisterEngineerFlag, registerEngineerFlag) .count().intValue(); @@ -164,7 +164,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public int countByFilingIdAndJoinWorkDateAfter(Long filingId, java.time.LocalDate joinWorkDate) { return super.lambdaQuery() - .eq(QualFilingPersonnelChangeDO::getFilingId, filingId) + .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate) .count().intValue(); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml index c2b6268d..82fe6dce 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml @@ -6,7 +6,7 @@ - + @@ -48,7 +48,7 @@ - `id`, `org_id`, `origin_filing_id`, `change_filing_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` + `id`, `org_id`, `filing_id`, `change_filing_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` diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingCommitmentChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingCommitmentChangeMapper.xml index 376ecd7b..fe7bffd9 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingCommitmentChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingCommitmentChangeMapper.xml @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ select id, - filing_id, + filing_change_id, commitment_content, legal_rep_signature_url, sign_date, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingEquipmentChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingEquipmentChangeMapper.xml index 88be9975..e284b851 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingEquipmentChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingEquipmentChangeMapper.xml @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ select id, - filing_id, + filing_change_id, source_equipment_id, device_name, device_model, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMaterialChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMaterialChangeMapper.xml index 8a062b58..5c67a3e0 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMaterialChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMaterialChangeMapper.xml @@ -7,7 +7,7 @@ - + @@ -34,7 +34,7 @@ select id, - filing_id, + filing_change_id, material_type, material_content, material_format, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml index 3e19b329..aa7ccfda 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml @@ -7,7 +7,7 @@ - + @@ -39,7 +39,7 @@ select id, - filing_id, + filing_change_id, filing_personnel_id, cert_name, cert_type_code, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml index 3bc8cc06..f018bb53 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml @@ -7,7 +7,7 @@ - + @@ -48,7 +48,7 @@ select id, - filing_id, + filing_change_id, source_personnel_id, person_name, person_type_code,