admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

五方主体修改

Browse Source
This commit is contained in:
pengjie 2024-06-03 11:14:40 +08:00
parent 2f65a08b2e
commit cb67546ca1
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -159,7 +160,13 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
engineeringMain.setEngineeringMainPersonList(engineeringMainPersons.stream().filter(l -> l.getMainId().equals(engineeringMain.getId())) engineeringMain.setEngineeringMainPersonList(engineeringMainPersons.stream().filter(l -> l.getMainId().equals(engineeringMain.getId()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
engineeringVo.setEngineeringMains(engineeringMains); List<List<EngineeringMain>> 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.setEngineeringSingles(engineeringSingles);
engineeringVo.setAnnexFiles(annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, engineeringVo.getEngineeringSn()))); engineeringVo.setAnnexFiles(annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, engineeringVo.getEngineeringSn())));
return engineeringVo; return engineeringVo;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java
View File

@ -66,7 +66,8 @@ public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleM
annexFileService.saveBatch(engineeringVo.getAnnexFiles()); annexFileService.saveBatch(engineeringVo.getAnnexFiles());
List<EnterpriseScore> scoreList = new ArrayList<>(); List<EnterpriseScore> scoreList = new ArrayList<>();
if (engineeringVo.getEngineeringMains() != null) { if (engineeringVo.getEngineeringMains() != null) {
for (EngineeringMain engineeringMain : engineeringVo.getEngineeringMains()) { for (List<EngineeringMain> engineeringMains : engineeringVo.getEngineeringMains()) {
for (EngineeringMain engineeringMain : engineeringMains) {
engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn()); engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn());
engineeringMainService.save(engineeringMain); engineeringMainService.save(engineeringMain);
if (engineeringMain.getEngineeringMainPersonList() != null) { if (engineeringMain.getEngineeringMainPersonList() != null) {
@ -90,6 +91,7 @@ public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleM
} }
} }
} }
}
enterpriseScoreService.saveBatch(scoreList); enterpriseScoreService.saveBatch(scoreList);
return true; return true;
} }

2
src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java
View File

@ -23,7 +23,7 @@ public class EngineeringVo extends Engineering {
@Valid @Valid
@NotEmpty(message = "责任主体不能为空") @NotEmpty(message = "责任主体不能为空")
@ApiModelProperty(value="工程主体") @ApiModelProperty(value="工程主体")
private List<EngineeringMain> engineeringMains; private List<List<EngineeringMain>> engineeringMains;
@ApiModelProperty(value="工程附件") @ApiModelProperty(value="工程附件")
private List<AnnexFile> annexFiles; private List<AnnexFile> annexFiles;