From 7fe459b850ec7c797da7f00bd5a31dbec6fa2d90 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 19 Apr 2022 11:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelController.java     |  6 +++++-
 .../mapper/ProjectRelatedPersonnelMapper.java  |  3 ++-
 .../IProjectRelatedPersonnelService.java       |  2 +-
 .../ProjectRelatedPersonnelServiceImpl.java    | 18 ++++++++----------
 4 files changed, 16 insertions(+), 13 deletions(-)

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 0e0f6dad5..6bb1dca71 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
@@ -126,7 +126,7 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	@ApiOperation(value="项目库-相关人员维护表-通过projectId查询", notes="项目库-相关人员维护表-通过projectId查询")
 	@GetMapping(value = "/queryByProjectId")
 	public Result<?> queryById(@RequestParam(name="projectId",required=true) String projectId) {
-		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId);
+		List<ProjectRelatedPersonnel> projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId);
 		if(projectRelatedPersonnel==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -139,6 +139,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
     * @param request
     * @param projectRelatedPersonnel
     */
+	@AutoLog(value = "项目库-相关人员维护表-导出excel")
+	@ApiOperation(value="项目库-相关人员维护表-导出excel", notes="项目库-相关人员维护表-导出excel")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectRelatedPersonnel projectRelatedPersonnel) {
         return super.exportXls(request, projectRelatedPersonnel, ProjectRelatedPersonnel.class, "项目库-相关人员维护表");
@@ -151,6 +153,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
     * @param response
     * @return
     */
+	@AutoLog(value = "项目库-相关人员维护表-通过excel导入数据")
+	@ApiOperation(value="项目库-相关人员维护表-通过excel导入数据", notes="项目库-相关人员维护表-通过excel导入数据")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ProjectRelatedPersonnel.class);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java
index 8ef6fb58f..763b57e52 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,5 @@ public interface ProjectRelatedPersonnelMapper extends BaseMapper<ProjectRelated
 
     IPage<ProjectRelatedPersonnel> queryPageList(IPage page, Map<String, Object> params);
 
-    ProjectRelatedPersonnel queryByProjectId(String projectId);
+    List<ProjectRelatedPersonnel> queryByProjectId(String projectId);
 }
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 faa75c83e..2e19edebd 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
@@ -52,7 +52,7 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 	 * @param projectId
 	 * @return
 	 */
-    ProjectRelatedPersonnel queryByProjectId(String projectId);
+    List<ProjectRelatedPersonnel> queryByProjectId(String projectId);
 
     /**
 	 * 列表查询
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 245df0551..165b9c488 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
@@ -94,9 +94,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 	 * @return
 	 */
 	@Override
-    public ProjectRelatedPersonnel queryByProjectId(String projectId) {
-		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelMapper.queryByProjectId(projectId);
-		return disposeData(projectRelatedPersonnel);
+    public List<ProjectRelatedPersonnel> queryByProjectId(String projectId) {
+		List<ProjectRelatedPersonnel> records = projectRelatedPersonnelMapper.queryByProjectId(projectId);
+		disposeData(records);
+		return records;
 	}
 
     /**
@@ -121,14 +122,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(page, params);
 		List<ProjectRelatedPersonnel> records = result.getRecords();
-		for (ProjectRelatedPersonnel projectRelatedPersonnel:records) {
-			disposeData(projectRelatedPersonnel);
-		}
+		disposeData(records);
 		return result;
 	}
-
-	public ProjectRelatedPersonnel disposeData(ProjectRelatedPersonnel projectRelatedPersonnel) {
-
+	public void disposeData(List<ProjectRelatedPersonnel> records) {
+		for (ProjectRelatedPersonnel projectRelatedPersonnel:records) {
 			//法规工程师
 			List<SysUser> lawEngineerUsers = new ArrayList<>();
 			List<String> lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(","));
@@ -218,7 +216,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 
 			}
 
-		return projectRelatedPersonnel;
+		}
 	}
 
 }