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 a8af91796..f89d94d31 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 @@ -247,4 +247,17 @@ public class ProjectRelatedPersonnelController extends JeroController queryLawEngineerByProjectId(@RequestParam Map params){ + List> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params); + return Result.OK(regulatoryEngineerMapList); + } } 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 29f18ec42..bb91c7abd 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 @@ -94,4 +94,11 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(String projectId); void setBatch(ProjectRelatedPersonnel projectRelatedPersonnel); + + /** + * 根据项目库id,查询相关人员名单中的法规工程师 + * @param params + * @return + */ + List> queryLawEngineerByProjectId(Map params); } 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 bcf2f4e85..0bae6ed58 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 @@ -1803,4 +1803,26 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> queryLawEngineerByProjectId(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)){ + String lawEngineerIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getLawEngineer())) + .map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.joining(",")); + List lawEngineerList = this.sysUserService.querySysUserListByIdList(Arrays.asList(lawEngineerIds.split(","))); + if(CollectionUtils.isNotEmpty(lawEngineerList)){ + for (SysUser lawEngineer : lawEngineerList) { + Map certificationEngineerMap = new HashMap<>(); + certificationEngineerMap.put("id",lawEngineer.getId()); + certificationEngineerMap.put("userName",lawEngineer.getUsername()); + resultList.add(certificationEngineerMap); + } + } + } + return resultList; + } + }