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 0dfec60..be0fd90 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 @@ -263,7 +263,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { } Long id = qualFilingChangeDomainService.aggregationSaveOrEdit(entity, commitmentEntity - , equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + , equipmentEntities, materialEntities, personnelEntities, personnelCertEntities, cmd.isAdd()); QualFilingChangeCO co = new QualFilingChangeCO(); co.setId(id); 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 91fbfb7..51762f2 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 @@ -32,6 +32,6 @@ public interface QualFilingChangeGateway { PageResult page(QualFilingChangeQuery query); Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity, - List equipmentEntities, List materialEntities, - List personnelEntities, List personnelCertEntities); + List equipmentEntities, List materialEntities, + List personnelEntities, List personnelCertEntities, boolean add); } 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 82bb585..09b977e 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 @@ -65,9 +65,9 @@ public class QualFilingChangeDomainService { } public Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity, - List equipmentEntities, List materialEntities, - List personnelEntities, List personnelCertEntities) { + List equipmentEntities, List materialEntities, + List personnelEntities, List personnelCertEntities, boolean add) { return qualFilingChangeGateway.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities - , personnelEntities, personnelCertEntities); + , personnelEntities, personnelCertEntities,add); } } 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 72d37af..6ab960f 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 @@ -92,7 +92,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(QualFilingChangeDO::getFilingId, filingId); wrapper.ne(QualFilingChangeDO::getFilingStatusCode, excludeStatusCode); - return qualFilingChangeMapper.selectCount(wrapper).intValue(); + return qualFilingChangeMapper.selectCount(wrapper).intValue(); } @Override @@ -140,7 +140,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { @Transactional(rollbackFor = Exception.class) public Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity , List equipmentEntities, List materialEntities - , List personnelEntities, List personnelCertEntities) { + , List personnelEntities, List personnelCertEntities, boolean add) { //保存基础信息 QualFilingChangeDO dataObject = qualFilingChangeDoConvertor.convertEeToDo(entity); if (Objects.nonNull(dataObject.getId())) { @@ -156,16 +156,17 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { } qualFilingCommitmentChangeMapper.delete(new LambdaQueryWrapper() - .eq(QualFilingCommitmentChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + .eq(QualFilingCommitmentChangeDO::getFilingChangeId, dataObject.getId())); qualFilingMaterialChangeMapper.delete(new LambdaQueryWrapper() - .eq(QualFilingMaterialChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + .eq(QualFilingMaterialChangeDO::getFilingChangeId, dataObject.getId())); qualFilingEquipmentChangeMapper.delete(new LambdaQueryWrapper() - .eq(QualFilingEquipmentChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + .eq(QualFilingEquipmentChangeDO::getFilingChangeId, dataObject.getId())); qualFilingPersonnelCertChangeMapper.delete(new LambdaQueryWrapper() - .eq(QualFilingPersonnelCertChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + .eq(QualFilingPersonnelCertChangeDO::getFilingChangeId, dataObject.getId())); qualFilingPersonnelChangeMapper.delete(new LambdaQueryWrapper() - .eq(QualFilingPersonnelChangeDO::getFilingChangeId,dataObject.getChangeFilingId())); + .eq(QualFilingPersonnelChangeDO::getFilingChangeId, dataObject.getId())); + //备案承诺书 QualFilingCommitmentChangeDO commitmentDataObject = qualFilingCommitmentChangeDoConvertor.convertEeToDo(commitmentEntity);