From 55b90a30682bc12dedf025e4a99f5da60632a86f Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 6 Aug 2026 14:05:23 +0800 Subject: [PATCH] sign --- .../gatewayimpl/QualFilingGatewayImpl.java | 76 +++++++++++-------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index 7e2a296..9db8f0a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java @@ -3,6 +3,7 @@ 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 com.baomidou.mybatisplus.extension.toolkit.Db; import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; import org.qinan.safetyeval.domain.entity.*; import org.qinan.safetyeval.domain.exception.BizException; @@ -197,35 +198,46 @@ public class QualFilingGatewayImpl implements QualFilingGateway { qualFilingPersonnelCertMapper.delete(new LambdaQueryWrapper().eq(QualFilingPersonnelCertDO::getFilingId, dataObject.getId())); //备案承诺书 - QualFilingCommitmentDO commitmentDataObject = new QualFilingCommitmentDO(); - BeanUtils.copyProperties(commitmentEntity, commitmentDataObject); - InsertFieldDefaults.apply(commitmentDataObject); - commitmentDataObject.setFilingId(dataObject.getId()); - qualFilingCommitmentMapper.insert(commitmentDataObject); + if (Objects.nonNull(commitmentEntity)) { + QualFilingCommitmentDO commitmentDataObject = new QualFilingCommitmentDO(); + BeanUtils.copyProperties(commitmentEntity, commitmentDataObject); + InsertFieldDefaults.apply(commitmentDataObject); + commitmentDataObject.setFilingId(dataObject.getId()); + qualFilingCommitmentMapper.insert(commitmentDataObject); + } //备案装备 - equipmentEntities.stream().map(item -> { - QualFilingEquipmentDO equipmentDataObject = new QualFilingEquipmentDO(); - BeanUtils.copyProperties(item, equipmentDataObject); - InsertFieldDefaults.apply(equipmentDataObject); - equipmentDataObject.setFilingId(dataObject.getId()); - return equipmentDataObject; - }).collect(Collectors.toList()).forEach(equipmentDataObject -> qualFilingEquipmentMapper.insert(equipmentDataObject)); + if (!CollectionUtils.isEmpty(equipmentEntities)) { + List equipmentDataObjects = equipmentEntities.stream().map(item -> { + QualFilingEquipmentDO equipmentDataObject = new QualFilingEquipmentDO(); + BeanUtils.copyProperties(item, equipmentDataObject); + InsertFieldDefaults.apply(equipmentDataObject); + equipmentDataObject.setFilingId(dataObject.getId()); + return equipmentDataObject; + }).collect(Collectors.toList()); + Db.saveBatch(equipmentDataObjects); + } //备案材料 - materialEntities.stream().map(item -> { - QualFilingMaterialDO materialDataObject = new QualFilingMaterialDO(); - BeanUtils.copyProperties(item, materialDataObject); - InsertFieldDefaults.apply(materialDataObject); - materialDataObject.setFilingId(dataObject.getId()); - return materialDataObject; - }).collect(Collectors.toList()).forEach(materialDataObject -> qualFilingMaterialMapper.insert(materialDataObject)); + if (!CollectionUtils.isEmpty(materialEntities)) { + List materialDataObjects = materialEntities.stream().map(item -> { + QualFilingMaterialDO materialDataObject = new QualFilingMaterialDO(); + BeanUtils.copyProperties(item, materialDataObject); + InsertFieldDefaults.apply(materialDataObject); + materialDataObject.setFilingId(dataObject.getId()); + return materialDataObject; + }).collect(Collectors.toList()); + Db.saveBatch(materialDataObjects); + } //备案人员 - personnelEntities.stream().map(item -> { - QualFilingPersonnelDO personnelDataObject = new QualFilingPersonnelDO(); - BeanUtils.copyProperties(item, personnelDataObject); - InsertFieldDefaults.apply(personnelDataObject); - personnelDataObject.setFilingId(dataObject.getId()); - return personnelDataObject; - }).collect(Collectors.toList()).forEach(personnelDataObject -> qualFilingPersonnelMapper.insert(personnelDataObject)); + if (!CollectionUtils.isEmpty(personnelEntities)) { + List personnelDataObjects = personnelEntities.stream().map(item -> { + QualFilingPersonnelDO personnelDataObject = new QualFilingPersonnelDO(); + BeanUtils.copyProperties(item, personnelDataObject); + InsertFieldDefaults.apply(personnelDataObject); + personnelDataObject.setFilingId(dataObject.getId()); + return personnelDataObject; + }).collect(Collectors.toList()); + Db.saveBatch(personnelDataObjects); + } //备案人员证书 if (CollectionUtils.isEmpty(personnelCertEntities)) { List sourcePersonnelIds = personnelEntities.stream().map(QualFilingPersonnelEntity::getSourcePersonnelId).collect(Collectors.toList()); @@ -233,7 +245,7 @@ public class QualFilingGatewayImpl implements QualFilingGateway { List orgPersonnelCertDOS = orgPersonnelCertMapper.selectList(new LambdaQueryWrapper() .in(OrgPersonnelCertDO::getPersonnelId, sourcePersonnelIds)); if (!CollectionUtils.isEmpty(orgPersonnelCertDOS)) { - for (OrgPersonnelCertDO orgPersonnelCertDO : orgPersonnelCertDOS) { + List personnelCertDataObjects = orgPersonnelCertDOS.stream().map(orgPersonnelCertDO -> { QualFilingPersonnelCertDO qualFilingPersonnelCertDO = new QualFilingPersonnelCertDO(); BeanUtils.copyProperties(orgPersonnelCertDO, qualFilingPersonnelCertDO, "id"); InsertFieldDefaults.apply(qualFilingPersonnelCertDO); @@ -241,18 +253,20 @@ public class QualFilingGatewayImpl implements QualFilingGateway { qualFilingPersonnelCertDO.setFilingId(dataObject.getId()); qualFilingPersonnelCertDO.setFilingPersonnelId(orgPersonnelCertDO.getPersonnelId()); qualFilingPersonnelCertDO.setSourceCertId(orgPersonnelCertDO.getId()); - qualFilingPersonnelCertMapper.insert(qualFilingPersonnelCertDO); - } + return qualFilingPersonnelCertDO; + }).collect(Collectors.toList()); + Db.saveBatch(personnelCertDataObjects); } } } else { - personnelCertEntities.stream().map(item -> { + List personnelCertDataObjects = personnelCertEntities.stream().map(item -> { QualFilingPersonnelCertDO personnelCertDataObject = new QualFilingPersonnelCertDO(); BeanUtils.copyProperties(item, personnelCertDataObject, "id"); InsertFieldDefaults.apply(personnelCertDataObject); personnelCertDataObject.setFilingId(dataObject.getId()); return personnelCertDataObject; - }).collect(Collectors.toList()).forEach(personnelCertDataObject -> qualFilingPersonnelCertMapper.insert(personnelCertDataObject)); + }).collect(Collectors.toList()); + Db.saveBatch(personnelCertDataObjects); } return dataObject.getId(); }