From 39402540dd674d0eadf78a32772d7905985cff99 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 6 Apr 2023 21:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEprojectId=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelController.java    | 13 +++++++++++
 .../IProjectRelatedPersonnelService.java      |  7 ++++++
 .../ProjectRelatedPersonnelServiceImpl.java   | 22 +++++++++++++++++++
 3 files changed, 42 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 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<ProjectRel
 		}
 
 	}
+
+	/**
+	 * 通过projectId查询法规工程师
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-相关人员维护表-根据projectId查询法规工程师")
+	@ApiOperation(value="项目库-相关人员维护表-根据projectId查询法规工程师", notes="项目库-相关人员维护表-根据projectId查询法规工程师")
+	@GetMapping(value = "/queryLawEngineerByProjectId")
+	public Result<?> queryLawEngineerByProjectId(@RequestParam Map<String,Object> params){
+		List<Map<String,Object>> 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<ProjectRelated
     List<ProjectRelatedPersonnel> queryCertificationEngineer(String projectId);
 
     void setBatch(ProjectRelatedPersonnel projectRelatedPersonnel);
+
+	/**
+	 * 根据项目库id，查询相关人员名单中的法规工程师
+	 * @param params
+	 * @return
+	 */
+	List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> 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<ProjectRelat
 		}
 	}
 
+	@Override
+	public List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> params) {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
+		List<ProjectRelatedPersonnel> 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<SysUser> lawEngineerList = this.sysUserService.querySysUserListByIdList(Arrays.asList(lawEngineerIds.split(",")));
+			if(CollectionUtils.isNotEmpty(lawEngineerList)){
+				for (SysUser lawEngineer : lawEngineerList) {
+					Map<String,Object> certificationEngineerMap = new HashMap<>();
+					certificationEngineerMap.put("id",lawEngineer.getId());
+					certificationEngineerMap.put("userName",lawEngineer.getUsername());
+					resultList.add(certificationEngineerMap);
+				}
+			}
+		}
+		return resultList;
+	}
+
 }