法规清单分页中-处理平台件信息
This commit is contained in:
zhn
+104
-55
@@ -11740,6 +11740,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
|
||||
List<String> lawsInventoryIdList = new ArrayList<>();
|
||||
List<String> inventoryIdList = new ArrayList<>();
|
||||
List<String> fileIdList = new ArrayList<>();
|
||||
List<String> userIdList = new ArrayList<>();
|
||||
if(!result.isEmpty()){
|
||||
lawsInventoryIdList = result.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
|
||||
@@ -11755,12 +11756,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
inventoryIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
|
||||
List<String> collect1 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
|
||||
List<String> collect2 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
|
||||
List<String> collect3 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
|
||||
List<String> collect4 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
|
||||
if(!collect1.isEmpty()){
|
||||
userIdList.addAll(collect1);
|
||||
}
|
||||
if(!collect2.isEmpty()){
|
||||
userIdList.addAll(collect2);
|
||||
}
|
||||
if(!collect3.isEmpty()){
|
||||
fileIdList.addAll(collect3);
|
||||
}
|
||||
if(!collect4.isEmpty()){
|
||||
fileIdList.addAll(collect4);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11768,8 +11777,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
List<SysCategory> categoryList = sysCategoryService.list();
|
||||
//文件
|
||||
List<OSSFile> fileInfos = new ArrayList<>();
|
||||
if (inventoryIdList.size() != 0) {
|
||||
fileInfos = iOSSFileService.getFileInfos(StringUtils.join(inventoryIdList, ","));
|
||||
if (fileIdList.size() != 0) {
|
||||
fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
|
||||
}
|
||||
List<SysUser> sysUsers = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(userIdList)) {
|
||||
@@ -11778,6 +11787,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
|
||||
sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
|
||||
}
|
||||
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
|
||||
String cut = projectLawsInventoryEO.getCut();
|
||||
for (ProjectLawsInventoryEO lawsInventoryEO : result) {
|
||||
if(!lawsInventoryPlatformEOList.isEmpty()){
|
||||
@@ -11789,65 +11799,104 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOS.stream()
|
||||
.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
|
||||
lawsInventoryEO.setProjectLawsInventoryEOS(lawsInventoryEOS);
|
||||
if(!lawsInventoryEOS.isEmpty()){
|
||||
projectLawsInventoryEOList.addAll(lawsInventoryEOS);
|
||||
}
|
||||
//如果关联平台件数据不为空，编辑时将设计符合性和验证符合性的数据覆盖
|
||||
if(!lawsInventoryEOS.isEmpty()){
|
||||
ProjectLawsInventoryEO inventoryEO = lawsInventoryEOS.get(0);
|
||||
//设计
|
||||
String designDeliverableType = inventoryEO.getDesignDeliverableType();//交付物类型
|
||||
String designDutyId = inventoryEO.getDesignDutyId();//责任人
|
||||
String designDeliverableTemplate = inventoryEO.getDesignDeliverableTemplate();//交付物模板
|
||||
//验证
|
||||
String verifyDeliverableType = inventoryEO.getVerifyDeliverableType();//交付物类型
|
||||
String verifyDutyId = inventoryEO.getVerifyDutyId();//责任人
|
||||
String verifyDeliverableTemplate = inventoryEO.getVerifyDeliverableTemplate();//交付物模板
|
||||
//设计交付物类型
|
||||
if (StringUtils.isNotBlank(designDeliverableType)) {
|
||||
lawsInventoryEO.setDesignDeliverableType(designDeliverableType);
|
||||
List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
|
||||
String name = getTreeName(cut, categoryList, designDeliverableTypeList);
|
||||
lawsInventoryEO.setDesignDeliverableTypeName(name);
|
||||
}
|
||||
//验证交付物类型
|
||||
if (StringUtils.isNotBlank(verifyDeliverableType)) {
|
||||
lawsInventoryEO.setVerifyDeliverableType(verifyDeliverableType);
|
||||
List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
|
||||
String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
|
||||
lawsInventoryEO.setVerifyDeliverableTypeName(name);
|
||||
}
|
||||
//交付物类型模板
|
||||
if (fileInfos.size() != 0) {
|
||||
if (StringUtils.isNotBlank(designDeliverableTemplate)) {
|
||||
lawsInventoryEO.setDesignDeliverableTemplate(designDeliverableTemplate);
|
||||
String fileName = this.editService.getFileName(null, fileInfos, designDeliverableTemplate);
|
||||
if (StringUtils.isNotBlank(fileName)) {
|
||||
lawsInventoryEO.setDesignDeliverableTemplateName(fileName);
|
||||
for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
|
||||
//设计
|
||||
String designDeliverableType = inventoryEO.getDesignDeliverableType();//交付物类型
|
||||
String designDutyId = inventoryEO.getDesignDutyId();//责任人
|
||||
String designDeliverableTemplate = inventoryEO.getDesignDeliverableTemplate();//交付物模板
|
||||
//验证
|
||||
String verifyDeliverableType = inventoryEO.getVerifyDeliverableType();//交付物类型
|
||||
String verifyDutyId = inventoryEO.getVerifyDutyId();//责任人
|
||||
String verifyDeliverableTemplate = inventoryEO.getVerifyDeliverableTemplate();//交付物模板
|
||||
//设计交付物类型
|
||||
if (StringUtils.isNotBlank(designDeliverableType)) {
|
||||
// lawsInventoryEO.setDesignDeliverableType(designDeliverableType);
|
||||
List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
|
||||
String name = getTreeName(cut, categoryList, designDeliverableTypeList);
|
||||
inventoryEO.setDesignDeliverableTypeName(name);
|
||||
}
|
||||
//验证交付物类型
|
||||
if (StringUtils.isNotBlank(verifyDeliverableType)) {
|
||||
// lawsInventoryEO.setVerifyDeliverableType(verifyDeliverableType);
|
||||
List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
|
||||
String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
|
||||
inventoryEO.setVerifyDeliverableTypeName(name);
|
||||
}
|
||||
//交付物类型模板
|
||||
if (fileInfos.size() != 0) {
|
||||
if (StringUtils.isNotBlank(designDeliverableTemplate)) {
|
||||
// lawsInventoryEO.setDesignDeliverableTemplate(designDeliverableTemplate);
|
||||
String fileName = this.editService.getFileName(null, fileInfos, designDeliverableTemplate);
|
||||
if (StringUtils.isNotBlank(fileName)) {
|
||||
inventoryEO.setDesignDeliverableTemplateName(fileName);
|
||||
}
|
||||
}
|
||||
if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
|
||||
// lawsInventoryEO.setVerifyDeliverableTemplate(verifyDeliverableTemplate);
|
||||
String fileName = this.editService.getFileName(null, fileInfos, verifyDeliverableTemplate);
|
||||
if (StringUtils.isNotBlank(fileName)) {
|
||||
inventoryEO.setVerifyDeliverableTemplateName(fileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
|
||||
lawsInventoryEO.setVerifyDeliverableTemplate(verifyDeliverableTemplate);
|
||||
String fileName = this.editService.getFileName(null, fileInfos, verifyDeliverableTemplate);
|
||||
if (StringUtils.isNotBlank(fileName)) {
|
||||
lawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
|
||||
}
|
||||
//设计责任人
|
||||
if (StringUtils.isNotEmpty(designDutyId)) {
|
||||
// lawsInventoryEO.setVerifyDutyId(designDutyId);
|
||||
String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
|
||||
map(SysUser::getUsername).collect(Collectors.joining(","));
|
||||
inventoryEO.setDesignDutyIdName(designDutyName);
|
||||
} else {
|
||||
inventoryEO.setDesignDutyIdName("");
|
||||
}
|
||||
//验证责任人
|
||||
if (StringUtils.isNotEmpty(verifyDutyId)) {
|
||||
// lawsInventoryEO.setVerifyDutyId(verifyDutyId);
|
||||
String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
|
||||
map(SysUser::getUsername).collect(Collectors.joining(","));
|
||||
inventoryEO.setVerifyDutyIdName(verifyDutyName);
|
||||
} else {
|
||||
inventoryEO.setVerifyDutyIdName("");
|
||||
}
|
||||
//设计交付物类型
|
||||
lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
|
||||
lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
|
||||
//验证交付物类型
|
||||
lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
|
||||
lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
|
||||
//交付物类型模板
|
||||
lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
|
||||
lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
|
||||
|
||||
lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
|
||||
lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
|
||||
|
||||
lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
|
||||
lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
|
||||
|
||||
lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
|
||||
lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
|
||||
}
|
||||
//设计责任人
|
||||
if (StringUtils.isNotEmpty(designDutyId)) {
|
||||
lawsInventoryEO.setVerifyDutyId(designDutyId);
|
||||
String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
|
||||
map(SysUser::getUsername).collect(Collectors.joining(","));
|
||||
lawsInventoryEO.setDesignDutyIdName(designDutyName);
|
||||
} else {
|
||||
lawsInventoryEO.setDesignDutyIdName("");
|
||||
}
|
||||
//验证责任人
|
||||
if (StringUtils.isNotEmpty(verifyDutyId)) {
|
||||
lawsInventoryEO.setVerifyDutyId(verifyDutyId);
|
||||
String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
|
||||
map(SysUser::getUsername).collect(Collectors.joining(","));
|
||||
lawsInventoryEO.setVerifyDutyIdName(verifyDutyName);
|
||||
} else {
|
||||
lawsInventoryEO.setVerifyDutyIdName("");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!projectLawsInventoryEOList.isEmpty()){
|
||||
List<String> projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
|
||||
LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
|
||||
List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseService.list(wrapper);
|
||||
for (ProjectLawsInventoryEO lawsInventoryEO : result) {
|
||||
List<ProjectLawsInventoryEO> lawsInventoryEOS = lawsInventoryEO.getProjectLawsInventoryEOS();
|
||||
if(!lawsInventoryEOS.isEmpty()){
|
||||
for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
|
||||
List<ProjectLibraryBase> collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
|
||||
if(!collect.isEmpty()){
|
||||
inventoryEO.setProjectName(collect.get(0).getProjectNameId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user