diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index aafb7b9..ff781a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -159,7 +160,13 @@ public class EngineeringServiceImpl extends ServiceImpl l.getMainId().equals(engineeringMain.getId())) .collect(Collectors.toList())); } - engineeringVo.setEngineeringMains(engineeringMains); + List> list = new ArrayList<>(); + list.add(engineeringMains.stream().filter(e -> e.getType() == 1).collect(Collectors.toList())); + list.add(engineeringMains.stream().filter(e -> e.getType() == 2).collect(Collectors.toList())); + list.add(engineeringMains.stream().filter(e -> e.getType() == 3).collect(Collectors.toList())); + list.add(engineeringMains.stream().filter(e -> e.getType() == 4).collect(Collectors.toList())); + list.add(engineeringMains.stream().filter(e -> e.getType() == 5).collect(Collectors.toList())); + engineeringVo.setEngineeringMains(list); engineeringVo.setEngineeringSingles(engineeringSingles); engineeringVo.setAnnexFiles(annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, engineeringVo.getEngineeringSn()))); return engineeringVo; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java index bdfed61..66f2eef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java @@ -66,27 +66,29 @@ public class EngineeringSingleServiceImpl extends ServiceImpl scoreList = new ArrayList<>(); if (engineeringVo.getEngineeringMains() != null) { - for (EngineeringMain engineeringMain : engineeringVo.getEngineeringMains()) { - engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn()); - engineeringMainService.save(engineeringMain); - if (engineeringMain.getEngineeringMainPersonList() != null) { - for (EngineeringMainPerson engineeringMainPerson : engineeringMain.getEngineeringMainPersonList()) { - engineeringMainPerson.setMainId(engineeringMain.getId()); - engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn()); + for (List engineeringMains : engineeringVo.getEngineeringMains()) { + for (EngineeringMain engineeringMain : engineeringMains) { + engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn()); + engineeringMainService.save(engineeringMain); + if (engineeringMain.getEngineeringMainPersonList() != null) { + for (EngineeringMainPerson engineeringMainPerson : engineeringMain.getEngineeringMainPersonList()) { + engineeringMainPerson.setMainId(engineeringMain.getId()); + engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn()); + } + engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList()); + } + EnterpriseScore scoreServiceOne = enterpriseScoreService.getOne(Wrappers.lambdaQuery() + .eq(EnterpriseScore::getEnterpriseSn, engineeringMain.getEnterpriseSn()) + .eq(EnterpriseScore::getEngineeringSn, engineeringVo.getEngineeringSn())); + if (scoreServiceOne == null) { + EnterpriseScore enterpriseScore = new EnterpriseScore(); + enterpriseScore.setEnterpriseSn(engineeringMain.getEnterpriseSn()); + enterpriseScore.setEngineeringSn(engineeringVo.getEngineeringSn()); + enterpriseScore.setEnterpriseType(engineeringMain.getType()); + enterpriseScore.setCreateBy(projectService.list().get(0).getGovernmentSn()); + enterpriseScore.setCreateTime(new Date()); + scoreList.add(enterpriseScore); } - engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList()); - } - EnterpriseScore scoreServiceOne = enterpriseScoreService.getOne(Wrappers.lambdaQuery() - .eq(EnterpriseScore::getEnterpriseSn, engineeringMain.getEnterpriseSn()) - .eq(EnterpriseScore::getEngineeringSn, engineeringVo.getEngineeringSn())); - if (scoreServiceOne == null) { - EnterpriseScore enterpriseScore = new EnterpriseScore(); - enterpriseScore.setEnterpriseSn(engineeringMain.getEnterpriseSn()); - enterpriseScore.setEngineeringSn(engineeringVo.getEngineeringSn()); - enterpriseScore.setEnterpriseType(engineeringMain.getType()); - enterpriseScore.setCreateBy(projectService.list().get(0).getGovernmentSn()); - enterpriseScore.setCreateTime(new Date()); - scoreList.add(enterpriseScore); } } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java index 044f7f4..7e06b44 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java @@ -23,7 +23,7 @@ public class EngineeringVo extends Engineering { @Valid @NotEmpty(message = "责任主体不能为空") @ApiModelProperty(value="工程主体") - private List engineeringMains; + private List> engineeringMains; @ApiModelProperty(value="工程附件") private List annexFiles;