From 3893045b559f65826a50b8c878a073bedbffd694 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 18 Apr 2023 11:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AE=E5=BA=93id?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=AF=A5=E9=A1=B9=E7=9B=AE=E4=B8=8B?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BA=BA=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 14 +++++++ .../IProjectRelatedPersonnelService.java | 2 + .../ProjectLawsInventoryEOServiceImpl.java | 36 +++++++++++++++++ .../ProjectRelatedPersonnelServiceImpl.java | 40 +++++++++++++++++++ 4 files changed, 92 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index f89d94d31..eb69d5e54 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -260,4 +260,18 @@ public class ProjectRelatedPersonnelController extends JeroController> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params); return Result.OK(regulatoryEngineerMapList); } + + //engineeringInterfacePerson + /** + * 通过projectId查询法规工程师 + * + * @return + */ + @AutoLog(value = "项目库-相关人员维护表-根据projectId查询工程接口人") + @ApiOperation(value="项目库-相关人员维护表-根据projectId查询工程接口人", notes="项目库-相关人员维护表-根据projectId查询工程接口人") + @GetMapping(value = "/queryEngineeringInterfacePersonByProjectId") + public Result queryEngineeringInterfacePersonByProjectId(@RequestParam Map params){ + List> engineeringInterfacePersonMapList = projectRelatedPersonnelService.queryEngineeringInterfacePersonByProjectId(params); + return Result.OK(engineeringInterfacePersonMapList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index bb91c7abd..9e34642b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -101,4 +101,6 @@ public interface IProjectRelatedPersonnelService extends IService> queryLawEngineerByProjectId(Map params); + + List> queryEngineeringInterfacePersonByProjectId(Map params); } 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 b05997bf2..3aa31a882 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 @@ -1588,6 +1588,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ +// Collections.sort(result,(e1,e2)->{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// } + } // 验证符合性排序 // 验证符合性-责任人 verifyDutyId @@ -1642,6 +1660,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ +// Collections.sort(result,(e1,e2)->{ +// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ +// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName()); +// } +// return -1; +// }); +// } + } } return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9382bec93..9fdee8e89 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1823,4 +1823,44 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> queryEngineeringInterfacePersonByProjectId(Map params) { + List> resultList = new ArrayList<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId)); + if(CollectionUtils.isNotEmpty(prpEoList)){ + List userIdList = new ArrayList<>(); + + String engineeringInterfacePersonIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineeringInterfacePerson())) + .map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){ + userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(","))); + } + String engineerAttSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerAttSet())) + .map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineerAttSetIds)){ + userIdList.addAll(Arrays.asList(engineerAttSetIds.split(","))); + } + String engineerLawSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerLawSet())) + .map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(engineerLawSetIds)){ + userIdList.addAll(Arrays.asList(engineerLawSetIds.split(","))); + } + + if(CollectionUtils.isNotEmpty(userIdList)){ + List engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList); + if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){ + for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) { + Map engineeringInterfacePersonMap = new HashMap<>(); + engineeringInterfacePersonMap.put("id",engineeringInterfacePerson.getId()); + engineeringInterfacePersonMap.put("userName",engineeringInterfacePerson.getUsername()); + resultList.add(engineeringInterfacePersonMap); + } + } + } + } + return resultList; + } + }