From d19a86494612a662748ce5ecc3329adbc003944c Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 2 Jul 2026 15:41:50 +0800 Subject: [PATCH] /compliance-check --- .../executor/QualFilingChangeExecutor.java | 178 +++++++++++++++++- .../QualFilingEquipmentChangeGateway.java | 7 + .../QualFilingMaterialChangeGateway.java | 7 + .../QualFilingPersonnelCertChangeGateway.java | 7 + .../QualFilingEquipmentChangeDoConvertor.java | 10 + .../QualFilingMaterialChangeDoConvertor.java | 10 + ...lFilingPersonnelCertChangeDoConvertor.java | 10 + .../QualFilingEquipmentChangeGatewayImpl.java | 6 + .../QualFilingMaterialChangeGatewayImpl.java | 6 + ...lFilingPersonnelCertChangeGatewayImpl.java | 6 + .../QualFilingEquipmentChangeRepository.java | 7 + .../QualFilingMaterialChangeRepository.java | 7 + ...alFilingPersonnelCertChangeRepository.java | 7 + ...alFilingEquipmentChangeRepositoryImpl.java | 9 + ...ualFilingMaterialChangeRepositoryImpl.java | 9 + ...lingPersonnelCertChangeRepositoryImpl.java | 9 + 16 files changed, 291 insertions(+), 4 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 6f647e7..ea1919d 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 @@ -7,8 +7,11 @@ 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.*; +import org.qinan.safetyeval.domain.change.gateway.*; import org.qinan.safetyeval.domain.change.model.*; +import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum; import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; +import org.qinan.safetyeval.domain.entity.QualFilingChangeDetailEntity; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; @@ -22,8 +25,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -51,6 +56,17 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { @Resource private QualFilingPersonnelCertChangeCmdConvertor qualFilingPersonnelCertChangeCmdConvertor; + @Resource + private QualFilingCommitmentChangeGateway qualFilingCommitmentChangeGateway; + @Resource + private QualFilingEquipmentChangeGateway qualFilingEquipmentChangeGateway; + @Resource + private QualFilingMaterialChangeGateway qualFilingMaterialChangeGateway; + @Resource + private QualFilingPersonnelChangeGateway qualFilingPersonnelChangeGateway; + @Resource + private QualFilingPersonnelCertChangeGateway qualFilingPersonnelCertChangeGateway; + @Override public SingleResponse add(QualFilingChangeAddCmd cmd) { QualFilingChangeEntity entity = new QualFilingChangeEntity(); @@ -179,10 +195,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { public SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd) { validateBeforeSaveOrEdit(cmd); - QualFilingChangeCO co = new QualFilingChangeCO(); - - - // 变更基本信息 QualFilingChangeEntity entity = qualFilingChangeCmdConvertor.convertCmdToE(cmd.getQualFilingChangeAddCmd()); @@ -214,6 +226,16 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { Long id = qualFilingChangeDomainService.aggregationSaveOrEdit(entity, commitmentEntity , equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + + // 编辑场景：对比请求数据与已有变更数据，生成变更明细 + if (!cmd.isAdd()) { + List details = diffFromCmd(cmd.getQualFilingChangeAddCmd().getId() + , entity, commitmentEntity, equipmentEntities + , materialEntities, personnelEntities, personnelCertEntities); + // TODO: 后续可将details传入domainService进行持久化 + } + + QualFilingChangeCO co = new QualFilingChangeCO(); co.setId(id); return SingleResponse.success(co); } @@ -248,6 +270,154 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { } } + /** + * 对比请求数据与已有变更数据，生成变更明细列表 + */ + private List diffFromCmd( + Long changeId, QualFilingChangeEntity newEntity, QualFilingCommitmentChangeE newCommitment, + List newEquipments, List newMaterials, + List newPersonnel, List newCerts) { + List details = new ArrayList<>(); + + // 基本信息变更 + QualFilingChangeEntity existingEntity = qualFilingChangeDomainService.get(changeId); + if (existingEntity != null && basicInfoChanged(existingEntity, newEntity)) { + details.add(stepDetail(changeId, QualFilingFormStepEnum.BASIC_INFO, "备案基本信息变更", + summarizeBasic(existingEntity), summarizeBasic(newEntity))); + } + + // 承诺书变更 + QualFilingCommitmentChangeE existingCommitment = qualFilingCommitmentChangeGateway.getByFilingId(changeId); + if (commitmentChanged(existingCommitment, newCommitment)) { + details.add(stepDetail(changeId, QualFilingFormStepEnum.COMMITMENT, "法定代表人承诺书变更", + "承诺书", "承诺书已变更")); + } + + // 装备清单变更 + List existingEquipments = qualFilingEquipmentChangeGateway.listByFilingId(changeId); + if (equipmentListChanged(existingEquipments, newEquipments)) { + details.add(stepDetail(changeId, QualFilingFormStepEnum.EQUIPMENT, "装备清单变更", + "装备清单", "装备清单已变更")); + } + + // 材料清单变更 + List existingMaterials = qualFilingMaterialChangeGateway.listByFilingId(changeId); + if (materialListChanged(existingMaterials, newMaterials)) { + details.add(stepDetail(changeId, QualFilingFormStepEnum.MATERIALS, "备案材料上传变更", + "材料清单", "材料清单已变更")); + } + + // 人员变更 + List existingPersonnel = qualFilingPersonnelChangeGateway.listByFilingId(changeId); + if (personnelListChanged(existingPersonnel, newPersonnel)) { + details.add(stepDetail(changeId, QualFilingFormStepEnum.PERSONNEL, "备案人员管理变更", + "人员清单", "人员清单已变更")); + } + + // 人员证书变更 + List existingCerts = qualFilingPersonnelCertChangeGateway.listByFilingId(changeId); + if (certListChanged(existingCerts, newCerts)) { + details.add(stepDetail(changeId, QualFilingFormStepEnum.PERSONNEL, "备案人员证书变更", + "人员证书清单", "人员证书清单已变更")); + } + + return details; + } + + private boolean basicInfoChanged(QualFilingChangeEntity exist, QualFilingChangeEntity newEntity) { + return !Objects.equals(exist.getFilingTerritoryCode(), newEntity.getFilingTerritoryCode()) + || !Objects.equals(exist.getBusinessScope(), newEntity.getBusinessScope()) + || !Objects.equals(exist.getRegisterAddress(), newEntity.getRegisterAddress()) + || !Objects.equals(exist.getOfficeAddress(), newEntity.getOfficeAddress()) + || !Objects.equals(exist.getCreditCode(), newEntity.getCreditCode()) + || !Objects.equals(exist.getQualCertNo(), newEntity.getQualCertNo()) + || !Objects.equals(exist.getLegalPersonPhone(), newEntity.getLegalPersonPhone()) + || !Objects.equals(exist.getContactPhone(), newEntity.getContactPhone()) + || !Objects.equals(exist.getInfoDisclosureUrl(), newEntity.getInfoDisclosureUrl()) + || !Objects.equals(exist.getFixedAssetAmount(), newEntity.getFixedAssetAmount()) + || !Objects.equals(exist.getArchiveRoomArea(), newEntity.getArchiveRoomArea()) + || !Objects.equals(exist.getFulltimeEvaluatorCount(), newEntity.getFulltimeEvaluatorCount()) + || !Objects.equals(exist.getRegisteredEngineerCount(), newEntity.getRegisteredEngineerCount()) + || !Objects.equals(exist.getWorkplaceArea(), newEntity.getWorkplaceArea()) + || !Objects.equals(exist.getUnitIntro(), newEntity.getUnitIntro()) + || !Objects.equals(exist.getAttachmentUrl(), newEntity.getAttachmentUrl()); + } + + private String summarizeBasic(QualFilingChangeEntity entity) { + return entity.getFilingUnitName() + "|" + entity.getBusinessScope(); + } + + private boolean commitmentChanged(QualFilingCommitmentChangeE exist, QualFilingCommitmentChangeE newEntity) { + String existSig = exist == null ? "" : exist.getCommitmentContent() + "|" + exist.getLegalRepSignatureUrl() + + "|" + exist.getSignDate() + "|" + exist.getLegalRepPersonnelId() + "|" + exist.getLegalRepName(); + String newSig = newEntity == null ? "" : newEntity.getCommitmentContent() + "|" + newEntity.getLegalRepSignatureUrl() + + "|" + newEntity.getSignDate() + "|" + newEntity.getLegalRepPersonnelId() + "|" + newEntity.getLegalRepName(); + return !existSig.equals(newSig); + } + + private boolean equipmentListChanged(List exist, List newList) { + return !equipmentSignature(exist).equals(equipmentSignature(newList)); + } + + private String equipmentSignature(List list) { + return safeList(list).stream() + .map(e -> e.getSourceEquipmentId() + ":" + e.getCalibrationReportUrl()) + .sorted() + .collect(Collectors.joining(";")); + } + + private boolean materialListChanged(List exist, List newList) { + return !materialSignature(exist).equals(materialSignature(newList)); + } + + private String materialSignature(List list) { + return safeList(list).stream() + .map(m -> m.getMaterialContent() + ":" + m.getAttachmentUrl()) + .sorted() + .collect(Collectors.joining(";")); + } + + private boolean personnelListChanged(List exist, List newList) { + return !personnelSignature(exist).equals(personnelSignature(newList)); + } + + private String personnelSignature(List list) { + return safeList(list).stream() + .map(QualFilingPersonnelChangeE::getSourcePersonnelId) + .map(String::valueOf) + .sorted() + .collect(Collectors.joining(",")); + } + + private boolean certListChanged(List exist, List newList) { + return !certSignature(exist).equals(certSignature(newList)); + } + + private String certSignature(List list) { + return safeList(list).stream() + .map(c -> c.getSourceCertId() + ":" + c.getCertNo() + ":" + c.getCertAttachmentUrl()) + .sorted() + .collect(Collectors.joining(";")); + } + + private List safeList(List list) { + return list == null ? Collections.emptyList() : list; + } + + private QualFilingChangeDetailEntity stepDetail(Long changeId, QualFilingFormStepEnum step, + String content, String before, String after) { + QualFilingChangeDetailEntity detail = new QualFilingChangeDetailEntity(); + detail.setChangeId(changeId); + detail.setFormStepCode(step.getCode()); + detail.setFormStepName(step.getName()); + detail.setChangeField("step:" + step.getCode()); + detail.setChangeContent(content); + detail.setChangeItemName(step.getName()); + detail.setBeforeValue(before); + detail.setAfterValue(after); + return detail; + } + private QualFilingChangeCO toCO(QualFilingChangeEntity entity) { if (entity == null) { return null; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingEquipmentChangeGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingEquipmentChangeGateway.java index 317e9ce..dd199a3 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingEquipmentChangeGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingEquipmentChangeGateway.java @@ -2,6 +2,8 @@ package org.qinan.safetyeval.domain.change.gateway; import org.qinan.safetyeval.domain.change.model.QualFilingEquipmentChangeE; +import java.util.List; + /** * 备案申请装备-变更网关 * @@ -41,4 +43,9 @@ public interface QualFilingEquipmentChangeGateway { * @return 结果 */ Boolean deletedQualFilingEquipmentChangeByIds(Long[] ids); + + /** + * 根据filingId查询备案申请装备-变更列表 + */ + List listByFilingId(Long filingId); } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingMaterialChangeGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingMaterialChangeGateway.java index f8eed49..27d0429 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingMaterialChangeGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingMaterialChangeGateway.java @@ -2,6 +2,8 @@ package org.qinan.safetyeval.domain.change.gateway; import org.qinan.safetyeval.domain.change.model.QualFilingMaterialChangeE; +import java.util.List; + /** * 备案申请材料-变更网关 * @@ -42,6 +44,11 @@ public interface QualFilingMaterialChangeGateway { */ Boolean deletedQualFilingMaterialChangeByIds(Long[] ids); + /** + * 根据filingId查询备案申请材料-变更列表 + */ + List listByFilingId(Long filingId); + /** * 统计指定filingId下满足上传状态和材料类型的记录数 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingPersonnelCertChangeGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingPersonnelCertChangeGateway.java index 0394bf9..d69928b 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingPersonnelCertChangeGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingPersonnelCertChangeGateway.java @@ -2,6 +2,8 @@ package org.qinan.safetyeval.domain.change.gateway; import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE; +import java.util.List; + /** * 备案申请人员证书网关 * @@ -41,4 +43,9 @@ public interface QualFilingPersonnelCertChangeGateway { * @return 结果 */ Boolean deletedQualFilingPersonnelCertChangeByIds(Long[] ids); + + /** + * 根据filingId查询备案申请人员证书列表 + */ + List listByFilingId(Long filingId); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingEquipmentChangeDoConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingEquipmentChangeDoConvertor.java index 055fba3..61e1a79 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingEquipmentChangeDoConvertor.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingEquipmentChangeDoConvertor.java @@ -50,4 +50,14 @@ public interface QualFilingEquipmentChangeDoConvertor { * @return */ List converDosToCos(List qualFilingEquipmentChangeDos); + + /** + * DO转领域对象 + */ + QualFilingEquipmentChangeE converDoToEe(QualFilingEquipmentChangeDO qualFilingEquipmentChangeDO); + + /** + * DOs转领域对象列表 + */ + List converDosToEes(List qualFilingEquipmentChangeDOs); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingMaterialChangeDoConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingMaterialChangeDoConvertor.java index f8edeb5..cd34a68 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingMaterialChangeDoConvertor.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingMaterialChangeDoConvertor.java @@ -50,4 +50,14 @@ public interface QualFilingMaterialChangeDoConvertor { * @return */ List converDosToCos(List qualFilingMaterialChangeDos); + + /** + * DO转领域对象 + */ + QualFilingMaterialChangeE converDoToEe(QualFilingMaterialChangeDO qualFilingMaterialChangeDO); + + /** + * DOs转领域对象列表 + */ + List converDosToEes(List qualFilingMaterialChangeDOs); } 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 4d73e17..fd5e7ae 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 @@ -53,6 +53,16 @@ public interface QualFilingPersonnelCertChangeDoConvertor { */ List converDosToCos(List qualFilingPersonnelCertChangeDos); + /** + * DO转领域对象 + */ + QualFilingPersonnelCertChangeE converDoToEe(QualFilingPersonnelCertChangeDO qualFilingPersonnelCertChangeDO); + + /** + * DOs转领域对象列表 + */ + List converDosToEes(List qualFilingPersonnelCertChangeDOs); + /** * OrgPersonnelCertDO转QualFilingPersonnelCertChangeDO * diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingEquipmentChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingEquipmentChangeGatewayImpl.java index e308aca..1875b72 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingEquipmentChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingEquipmentChangeGatewayImpl.java @@ -45,4 +45,10 @@ public class QualFilingEquipmentChangeGatewayImpl implements QualFilingEquipment public Boolean deletedQualFilingEquipmentChangeByIds(Long[] ids) { return qualFilingEquipmentChangeRepository.deletedQualFilingEquipmentChangeByIds(ids); } + + @Override + public java.util.List listByFilingId(Long filingId) { + return qualFilingEquipmentChangeDoConvertor.converDosToEes( + qualFilingEquipmentChangeRepository.listByFilingId(filingId)); + } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingMaterialChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingMaterialChangeGatewayImpl.java index 27ddbbd..8f9db83 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingMaterialChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingMaterialChangeGatewayImpl.java @@ -46,6 +46,12 @@ public class QualFilingMaterialChangeGatewayImpl implements QualFilingMaterialCh return qualFilingMaterialChangeRepository.deletedQualFilingMaterialChangeByIds(ids); } + @Override + public java.util.List listByFilingId(Long filingId) { + return qualFilingMaterialChangeDoConvertor.converDosToEes( + qualFilingMaterialChangeRepository.listByFilingId(filingId)); + } + @Override public int countByFilingIdAndUploadStatusCodeAndMaterialType(Long filingId, Integer uploadStatusCode, String materialType) { return qualFilingMaterialChangeRepository.countByFilingIdAndUploadStatusCodeAndMaterialType(filingId, uploadStatusCode, materialType); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingPersonnelCertChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingPersonnelCertChangeGatewayImpl.java index 69a410e..b63df01 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingPersonnelCertChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingPersonnelCertChangeGatewayImpl.java @@ -45,4 +45,10 @@ public class QualFilingPersonnelCertChangeGatewayImpl implements QualFilingPerso public Boolean deletedQualFilingPersonnelCertChangeByIds(Long[] ids) { return qualFilingPersonnelCertChangeRepository.deletedQualFilingPersonnelCertChangeByIds(ids); } + + @Override + public java.util.List listByFilingId(Long filingId) { + return qualFilingPersonnelCertChangeDoConvertor.converDosToEes( + qualFilingPersonnelCertChangeRepository.listByFilingId(filingId)); + } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingEquipmentChangeRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingEquipmentChangeRepository.java index d53fd0e..ea45ccd 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingEquipmentChangeRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingEquipmentChangeRepository.java @@ -5,6 +5,8 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangePageQry; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingEquipmentChangeDO; +import java.util.List; + /** * 备案申请装备-变更 * @@ -62,4 +64,9 @@ public interface QualFilingEquipmentChangeRepository extends BaseRepository listByFilingId(Long filingId); + } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingMaterialChangeRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingMaterialChangeRepository.java index f9e99b6..cd3f175 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingMaterialChangeRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingMaterialChangeRepository.java @@ -5,6 +5,8 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangePageQry; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingMaterialChangeDO; +import java.util.List; + /** * 备案申请材料-变更 * @@ -62,6 +64,11 @@ public interface QualFilingMaterialChangeRepository extends BaseRepository listByFilingId(Long filingId); + /** * 统计指定filingId下满足上传状态和材料类型的记录数 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingPersonnelCertChangeRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingPersonnelCertChangeRepository.java index 515e968..e0fcd17 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingPersonnelCertChangeRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingPersonnelCertChangeRepository.java @@ -5,6 +5,8 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangePageQry; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingPersonnelCertChangeDO; +import java.util.List; + /** * 备案申请人员证书 * @@ -62,4 +64,9 @@ public interface QualFilingPersonnelCertChangeRepository extends BaseRepository< */ Boolean deletedQualFilingPersonnelCertChangeByIds(Long[] ids); + /** + * 根据filingId查询备案申请人员证书列表 + */ + List listByFilingId(Long filingId); + } 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 b0bb292..d29af2a 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 @@ -13,6 +13,7 @@ import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingEqui import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.List; /** * 备案申请装备-变更 @@ -114,4 +115,12 @@ public class QualFilingEquipmentChangeRepositoryImpl extends BaseRepositoryImpl< public Boolean deletedQualFilingEquipmentChangeByIds(Long[] ids) { return super.removeBatchEnByIds(Arrays.asList(ids)); } + + @Override + public List listByFilingId(Long filingId) { + return super.lambdaQuery() + .eq(QualFilingEquipmentChangeDO::getFilingChangeId, filingId) + .eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .list(); + } } 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 8c0b973..18091fe 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 @@ -13,6 +13,7 @@ import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingMate import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.List; /** * 备案申请材料-变更 @@ -94,6 +95,14 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl listByFilingId(Long filingId) { + return super.lambdaQuery() + .eq(QualFilingMaterialChangeDO::getFilingChangeId, filingId) + .eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .list(); + } + @Override public int countByFilingIdAndUploadStatusCodeAndMaterialType(Long filingId, Integer uploadStatusCode, String materialType) { return super.lambdaQuery() diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java index f56cec0..9cf3c48 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java @@ -13,6 +13,7 @@ import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingPers import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.List; /** * 备案申请人员证书 @@ -108,4 +109,12 @@ public class QualFilingPersonnelCertChangeRepositoryImpl extends BaseRepositoryI public Boolean deletedQualFilingPersonnelCertChangeByIds(Long[] ids) { return super.removeBatchEnByIds(Arrays.asList(ids)); } + + @Override + public List listByFilingId(Long filingId) { + return super.lambdaQuery() + .eq(QualFilingPersonnelCertChangeDO::getFilingChangeId, filingId) + .eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .list(); + } }