diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index f2be946..1c87768 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -18,6 +18,8 @@ import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType; import com.chinaunicom.mall.ebtp.common.log.service.OperationLogService; import com.chinaunicom.mall.ebtp.common.util.JsonUtils; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.project.bidratio.entity.BidRatio; +import com.chinaunicom.mall.ebtp.project.bidratio.service.IBidRatioService; import com.chinaunicom.mall.ebtp.project.common.EbpProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum; @@ -89,6 +91,9 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl> sectionMaterialMap = sectionMaterialList.stream().collect(Collectors.groupingBy(SectionMaterial::getSectionId)); + //查询中选分配原则 + QueryWrapper bidRatioQueryWrapper = new QueryWrapper<>(); + meMaterialQueryWrapper.in("section_id",sectionIds); + List bidRatioList = bidRatioService.list(bidRatioQueryWrapper); + //转换成map形式方便处理数据 + Map> bidRatioMap = bidRatioList.stream().collect(Collectors.groupingBy(BidRatio::getSectionId)); + //最终要插入的数据结果 List sectionSupplierAddList = new ArrayList<>(); List materialAddList = new ArrayList<>(); + List bidRatioAddList = new ArrayList<>(); //是否资审预审项目 boolean isReviewMethod = projectRecordService.isReviewMethod(projectRecord); @@ -447,6 +460,18 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl ratioList = bidRatioMap.get(section.getParentSectionId()); + if (null != ratioList && !ratioList.isEmpty()) { + for (BidRatio bidRatio : ratioList) { + bidRatio.setSectionId(section.getId()); + bidRatio.setProjectId(projectRecord.getId()); + bidRatio.setCreateDate(null); + bidRatio.setUpdateDate(null); + bidRatio.setId(PropertyUtils.getSnowflakeId()); + } + bidRatioAddList.addAll(ratioList); + } } projectRecord.setCreateDate(null); @@ -465,6 +490,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl