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 1b9e304..f6304cc 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 @@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil; 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.change.model.*; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; import org.qinan.safetyeval.domain.exception.BizException; @@ -185,29 +186,35 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { 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)); + if (!CollectionUtils.isEmpty(equipmentEntities)) { + List equipmentDataObjects = equipmentEntities.stream().map(item -> { + QualFilingEquipmentChangeDO equipmentDataObject = qualFilingEquipmentChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(equipmentDataObject); + equipmentDataObject.setFilingChangeId(dataObject.getId()); + return equipmentDataObject; + }).collect(Collectors.toList()); + Db.saveBatch(equipmentDataObjects); + } //备案材料 - 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)); + if (!CollectionUtils.isEmpty(materialEntities)) { + List materialDataObjects = materialEntities.stream().map(item -> { + QualFilingMaterialChangeDO materialDataObject = qualFilingMaterialChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(materialDataObject); + materialDataObject.setFilingChangeId(dataObject.getId()); + return materialDataObject; + }).collect(Collectors.toList()); + Db.saveBatch(materialDataObjects); + } //备案人员 - 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(personnelEntities)) { + List personnelDataObjects = personnelEntities.stream().map(item -> { + QualFilingPersonnelChangeDO personnelDataObject = qualFilingPersonnelChangeDoConvertor.convertEeToDo(item); + InsertFieldDefaults.apply(personnelDataObject); + personnelDataObject.setFilingChangeId(dataObject.getId()); + return personnelDataObject; + }).collect(Collectors.toList()); + Db.saveBatch(personnelDataObjects); + } //备案人员证书 if (CollectionUtils.isEmpty(personnelCertEntities)) { List sourcePersonnelIds = personnelEntities @@ -216,23 +223,24 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { List orgPersonnelCertDOS = orgPersonnelCertMapper.selectList(new LambdaQueryWrapper() .in(OrgPersonnelCertDO::getPersonnelId, sourcePersonnelIds)); if (!CollectionUtils.isEmpty(orgPersonnelCertDOS)) { - for (OrgPersonnelCertDO orgPersonnelCertDO : orgPersonnelCertDOS) { + List personnelCertDataObjects = orgPersonnelCertDOS.stream().map(orgPersonnelCertDO -> { QualFilingPersonnelCertChangeDO qualFilingPersonnelCertChangeDO = qualFilingPersonnelCertChangeDoConvertor.convertOrgDoToChangeDo(orgPersonnelCertDO); InsertFieldDefaults.apply(qualFilingPersonnelCertChangeDO); qualFilingPersonnelCertChangeDO.setFilingChangeId(dataObject.getId()); - qualFilingPersonnelCertChangeMapper.insert(qualFilingPersonnelCertChangeDO); - } + return qualFilingPersonnelCertChangeDO; + }).collect(Collectors.toList()); + Db.saveBatch(personnelCertDataObjects); } } } else { - personnelCertEntities.stream().map(item -> { + List personnelCertDataObjects = 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)); + }).collect(Collectors.toList()); + Db.saveBatch(personnelCertDataObjects); } return dataObject.getId(); }