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

/compliance-check

dev
luotaiqian 2026-07-02 15:41:50 +08:00
parent 634468bc85
commit d19a864946
16 changed files with 291 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<QualFilingChangeCO> add(QualFilingChangeAddCmd cmd) {
QualFilingChangeEntity entity = new QualFilingChangeEntity();
@ -179,10 +195,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
public SingleResponse<QualFilingChangeCO> 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<QualFilingChangeDetailEntity> 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<QualFilingChangeDetailEntity> diffFromCmd(
Long changeId, QualFilingChangeEntity newEntity, QualFilingCommitmentChangeE newCommitment,
List<QualFilingEquipmentChangeE> newEquipments, List<QualFilingMaterialChangeE> newMaterials,
List<QualFilingPersonnelChangeE> newPersonnel, List<QualFilingPersonnelCertChangeE> newCerts) {
List<QualFilingChangeDetailEntity> 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<QualFilingEquipmentChangeE> existingEquipments = qualFilingEquipmentChangeGateway.listByFilingId(changeId);
if (equipmentListChanged(existingEquipments, newEquipments)) {
details.add(stepDetail(changeId, QualFilingFormStepEnum.EQUIPMENT, "装备清单变更",
"装备清单", "装备清单已变更"));
}
// 材料清单变更
List<QualFilingMaterialChangeE> existingMaterials = qualFilingMaterialChangeGateway.listByFilingId(changeId);
if (materialListChanged(existingMaterials, newMaterials)) {
details.add(stepDetail(changeId, QualFilingFormStepEnum.MATERIALS, "备案材料上传变更",
"材料清单", "材料清单已变更"));
}
// 人员变更
List<QualFilingPersonnelChangeE> existingPersonnel = qualFilingPersonnelChangeGateway.listByFilingId(changeId);
if (personnelListChanged(existingPersonnel, newPersonnel)) {
details.add(stepDetail(changeId, QualFilingFormStepEnum.PERSONNEL, "备案人员管理变更",
"人员清单", "人员清单已变更"));
}
// 人员证书变更
List<QualFilingPersonnelCertChangeE> 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<QualFilingEquipmentChangeE> exist, List<QualFilingEquipmentChangeE> newList) {
return !equipmentSignature(exist).equals(equipmentSignature(newList));
}
private String equipmentSignature(List<QualFilingEquipmentChangeE> list) {
return safeList(list).stream()
.map(e -> e.getSourceEquipmentId() + ":" + e.getCalibrationReportUrl())
.sorted()
.collect(Collectors.joining(";"));
}
private boolean materialListChanged(List<QualFilingMaterialChangeE> exist, List<QualFilingMaterialChangeE> newList) {
return !materialSignature(exist).equals(materialSignature(newList));
}
private String materialSignature(List<QualFilingMaterialChangeE> list) {
return safeList(list).stream()
.map(m -> m.getMaterialContent() + ":" + m.getAttachmentUrl())
.sorted()
.collect(Collectors.joining(";"));
}
private boolean personnelListChanged(List<QualFilingPersonnelChangeE> exist, List<QualFilingPersonnelChangeE> newList) {
return !personnelSignature(exist).equals(personnelSignature(newList));
}
private String personnelSignature(List<QualFilingPersonnelChangeE> list) {
return safeList(list).stream()
.map(QualFilingPersonnelChangeE::getSourcePersonnelId)
.map(String::valueOf)
.sorted()
.collect(Collectors.joining(","));
}
private boolean certListChanged(List<QualFilingPersonnelCertChangeE> exist, List<QualFilingPersonnelCertChangeE> newList) {
return !certSignature(exist).equals(certSignature(newList));
}
private String certSignature(List<QualFilingPersonnelCertChangeE> list) {
return safeList(list).stream()
.map(c -> c.getSourceCertId() + ":" + c.getCertNo() + ":" + c.getCertAttachmentUrl())
.sorted()
.collect(Collectors.joining(";"));
}
private <T> List<T> safeList(List<T> 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;

7
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingEquipmentChangeGateway.java
View File

@ -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<QualFilingEquipmentChangeE> listByFilingId(Long filingId);
}

7
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingMaterialChangeGateway.java
View File

@ -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<QualFilingMaterialChangeE> listByFilingId(Long filingId);
/**
* 统计指定filingId下满足上传状态和材料类型的记录数
*/

7
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/gateway/QualFilingPersonnelCertChangeGateway.java
View File

@ -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<QualFilingPersonnelCertChangeE> listByFilingId(Long filingId);
}

10
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingEquipmentChangeDoConvertor.java
View File

@ -50,4 +50,14 @@ public interface QualFilingEquipmentChangeDoConvertor {
* @return
*/
List<QualFilingEquipmentChangeCo> converDosToCos(List<QualFilingEquipmentChangeDO> qualFilingEquipmentChangeDos);
/**
* DO转领域对象
*/
QualFilingEquipmentChangeE converDoToEe(QualFilingEquipmentChangeDO qualFilingEquipmentChangeDO);
/**
* DOs转领域对象列表
*/
List<QualFilingEquipmentChangeE> converDosToEes(List<QualFilingEquipmentChangeDO> qualFilingEquipmentChangeDOs);
}

10
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingMaterialChangeDoConvertor.java
View File

@ -50,4 +50,14 @@ public interface QualFilingMaterialChangeDoConvertor {
* @return
*/
List<QualFilingMaterialChangeCo> converDosToCos(List<QualFilingMaterialChangeDO> qualFilingMaterialChangeDos);
/**
* DO转领域对象
*/
QualFilingMaterialChangeE converDoToEe(QualFilingMaterialChangeDO qualFilingMaterialChangeDO);
/**
* DOs转领域对象列表
*/
List<QualFilingMaterialChangeE> converDosToEes(List<QualFilingMaterialChangeDO> qualFilingMaterialChangeDOs);
}

10
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingPersonnelCertChangeDoConvertor.java
View File

@ -53,6 +53,16 @@ public interface QualFilingPersonnelCertChangeDoConvertor {
*/
List<QualFilingPersonnelCertChangeCo> converDosToCos(List<QualFilingPersonnelCertChangeDO> qualFilingPersonnelCertChangeDos);
/**
* DO转领域对象
*/
QualFilingPersonnelCertChangeE converDoToEe(QualFilingPersonnelCertChangeDO qualFilingPersonnelCertChangeDO);
/**
* DOs转领域对象列表
*/
List<QualFilingPersonnelCertChangeE> converDosToEes(List<QualFilingPersonnelCertChangeDO> qualFilingPersonnelCertChangeDOs);
/**
* OrgPersonnelCertDO转QualFilingPersonnelCertChangeDO
*

6
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingEquipmentChangeGatewayImpl.java
View File

@ -45,4 +45,10 @@ public class QualFilingEquipmentChangeGatewayImpl implements QualFilingEquipment
public Boolean deletedQualFilingEquipmentChangeByIds(Long[] ids) {
return qualFilingEquipmentChangeRepository.deletedQualFilingEquipmentChangeByIds(ids);
}
@Override
public java.util.List<QualFilingEquipmentChangeE> listByFilingId(Long filingId) {
return qualFilingEquipmentChangeDoConvertor.converDosToEes(
qualFilingEquipmentChangeRepository.listByFilingId(filingId));
}
}

6
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingMaterialChangeGatewayImpl.java
View File

@ -46,6 +46,12 @@ public class QualFilingMaterialChangeGatewayImpl implements QualFilingMaterialCh
return qualFilingMaterialChangeRepository.deletedQualFilingMaterialChangeByIds(ids);
}
@Override
public java.util.List<QualFilingMaterialChangeE> 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);

6
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/QualFilingPersonnelCertChangeGatewayImpl.java
View File

@ -45,4 +45,10 @@ public class QualFilingPersonnelCertChangeGatewayImpl implements QualFilingPerso
public Boolean deletedQualFilingPersonnelCertChangeByIds(Long[] ids) {
return qualFilingPersonnelCertChangeRepository.deletedQualFilingPersonnelCertChangeByIds(ids);
}
@Override
public java.util.List<QualFilingPersonnelCertChangeE> listByFilingId(Long filingId) {
return qualFilingPersonnelCertChangeDoConvertor.converDosToEes(
qualFilingPersonnelCertChangeRepository.listByFilingId(filingId));
}
}

7
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingEquipmentChangeRepository.java
View File

@ -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<Qual
*/
Boolean deletedQualFilingEquipmentChangeByIds(Long[] ids);
/**
* 根据filingId查询备案申请装备-变更列表
*/
List<QualFilingEquipmentChangeDO> listByFilingId(Long filingId);
}

7
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingMaterialChangeRepository.java
View File

@ -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<QualF
*/
Boolean deletedQualFilingMaterialChangeByIds(Long[] ids);
/**
* 根据filingId查询备案申请材料-变更列表
*/
List<QualFilingMaterialChangeDO> listByFilingId(Long filingId);
/**
* 统计指定filingId下满足上传状态和材料类型的记录数
*/

7
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/QualFilingPersonnelCertChangeRepository.java
View File

@ -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<QualFilingPersonnelCertChangeDO> listByFilingId(Long filingId);
}

9
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java
View File

@ -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<QualFilingEquipmentChangeDO> listByFilingId(Long filingId) {
return super.lambdaQuery()
.eq(QualFilingEquipmentChangeDO::getFilingChangeId, filingId)
.eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue())
.list();
}
}

9
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java
View File

@ -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<Q
return super.removeBatchEnByIds(Arrays.asList(ids));
}
@Override
public List<QualFilingMaterialChangeDO> 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()

9
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java
View File

@ -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<QualFilingPersonnelCertChangeDO> listByFilingId(Long filingId) {
return super.lambdaQuery()
.eq(QualFilingPersonnelCertChangeDO::getFilingChangeId, filingId)
.eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue())
.list();
}
}