From e2b582b6a3362c22e6ff69bb6bf0bda1cd49f711 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 13 Jul 2022 10:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=85=A5=E7=9B=B8=E5=85=B3=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 361b94422..4affa4edb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -94,6 +94,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -119,6 +120,7 @@ import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServic * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl implements IProjectLawsInventoryEOService { @Autowired @@ -1727,8 +1729,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnelList = projectRelatedPersonnels.stream() - .filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList()); + List projectRelatedPersonnelList = new ArrayList<>(); + for (String s : dutyTerritory.split(",")) { + List projectRelatedPersonnelListTemp = projectRelatedPersonnels.stream() + .filter(e -> s.equals(e.getDutyTerritory())).collect(Collectors.toList()); + if(projectRelatedPersonnelListTemp.size() != 0){ + projectRelatedPersonnelList.addAll(projectRelatedPersonnelListTemp); + } + } +// List projectRelatedPersonnelList = projectRelatedPersonnels.stream() +// .filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList()); List lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList()); List engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());