diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 58ce204a7..e2e621b0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -31,11 +31,13 @@ import com.jero.modules.collection.entity.OnlCgformCollection; import com.jero.modules.collection.service.IOnlCgformCollectionService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.OSSFileForDocumentLibrary; +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.enums.LawsStateEnum; import com.jero.modules.document.enums.SearchEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; import com.jero.modules.document.utils.ReadPdfUtil; import com.jero.modules.document.utils.ReadWordUtil; import com.jero.modules.document.vo.QueryConditionVO; @@ -188,6 +190,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl !FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); @@ -4790,6 +4802,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysDictItems = sysDictItemServiceImpl.selectItemsAll(); //文件字段 @@ -4800,13 +4813,60 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl connectIdList = new ArrayList<>(); + List idList = datas.stream().map(data -> (String) data.get("id")).distinct().collect(Collectors.toList()); + + List phasedImplDetailsEOList = null; + if(CollectionUtils.isNotEmpty(idList)){ + QueryWrapper phasedImplDetailsQueryWrap = new QueryWrapper<>(); + phasedImplDetailsQueryWrap.lambda().in(PhasedImplementationDetailsEO::getBussDocumentLibraryId,idList); + phasedImplDetailsEOList = this.phasedImplementationDetailsEOService.list(phasedImplDetailsQueryWrap); + } + for (Map data : datas) { + StringBuilder phasedImplDetailsSb = new StringBuilder(); + String id = (String) data.get("id"); + for (OnlCgformField onlCgformField : fileFieldList) { String value = StringUtils.valueOf(data.get(onlCgformField.getDbFieldName())); if (StringUtils.isNotBlank(value)) { connectIdList.add(value); } } + + if(CollectionUtils.isNotEmpty(phasedImplDetailsEOList)){ + List phasedImplDetailsEOListTemp = phasedImplDetailsEOList.stream().filter(phased -> { + boolean flag = false; + if(StringUtils.equals(id,phased.getBussDocumentLibraryId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(phasedImplDetailsEOListTemp)){ + for (PhasedImplementationDetailsEO detailsEO : phasedImplDetailsEOListTemp) { + StringBuilder phasedImplDetailsSbTemp = new StringBuilder(); + if(StringUtils.isNotEmpty(phasedImplDetailsSb.toString())){ + phasedImplDetailsSb.append("#"); + } + if(StringUtils.isNotEmpty(detailsEO.getStandNumberOrClause())){ + phasedImplDetailsSbTemp.append(detailsEO.getStandNumberOrClause()).append(""); + } + if(StringUtils.isNotEmpty(detailsEO.getImplementationType())){ + phasedImplDetailsSbTemp.append(detailsEO.getImplementationType()).append(""); + } + if(detailsEO.getImplementationDate()!=null){ + phasedImplDetailsSbTemp.append(DateUtils.formatTime(detailsEO.getImplementationDate())).append(""); + } + if(StringUtils.isNotEmpty(detailsEO.getRemarks())){ + phasedImplDetailsSbTemp.append(detailsEO.getRemarks()).append(""); + } + if(StringUtils.isNotEmpty(phasedImplDetailsSbTemp.toString())){ + phasedImplDetailsSb.append(phasedImplDetailsSbTemp.toString().substring(0,phasedImplDetailsSbTemp.toString().length()-3)); + } + } + } + } + data.put("phasedImplDetails",phasedImplDetailsSb.toString()); } //所有的文件信息 List fileInfos = new ArrayList<>(); @@ -4856,7 +4916,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl