From 4dae284060cc5ac59789534bc437168b3a61d481 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 10 May 2022 17:27:18 +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-=E5=A2=9E=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 14 +++++++++++ .../IProjectRelatedPersonnelService.java | 2 ++ .../ProjectRelatedPersonnelServiceImpl.java | 25 +++++++++++++++++++ 3 files changed, 41 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 01ba398e6..0aea7c9e9 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 @@ -7,6 +7,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.util.ExcelLangUtils; +import com.jero.modules.system.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -197,4 +198,17 @@ public class ProjectRelatedPersonnelController extends JeroController objectMap = this.projectRelatedPersonnelService.queryPersonByProjectId(projectId, dutyTerritory); return Result.OK(objectMap); } + + /** + * 通过projectId查询认证工程师 + * + * @return + */ + @AutoLog(value = "项目库-相关人员维护表-根据projectId查询认证工程师") + @ApiOperation(value="项目库-相关人员维护表-根据projectId查询认证工程师", notes="项目库-相关人员维护表-根据projectId查询认证工程师") + @GetMapping(value = "/queryCertificationEngineer") + public Result queryCertificationEngineer(@RequestParam(name="projectId",required=true) String projectId){ + List certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId); + return Result.OK(certificationEngineerList); + } } 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 3cb185df3..f4cccaab2 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 @@ -3,6 +3,7 @@ package com.jero.modules.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectRelatedPersonnel; +import com.jero.modules.system.entity.SysUser; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -85,4 +86,5 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(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 065e57268..81d4990ce 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 @@ -759,4 +759,29 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryCertificationEngineer(String projectId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List list = list(queryWrapper.eq("project_id",projectId)); + + List certificationEngineerList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList()); + + StringBuilder userIdBuilder=new StringBuilder(); + List certificationEngineerUsers = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(certificationEngineerList)){ + for(String certificationEngineerId :certificationEngineerList){ + if(StringUtils.isNotBlank(certificationEngineerId)) { + userIdBuilder.append(certificationEngineerId).append(","); + } + } + String userId = userIdBuilder.substring(0, userIdBuilder.toString().length() - 1); + List userIdList = Arrays.asList(userId.split(",")); + userIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", userIdList); + certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper); + } + return certificationEngineerUsers; + } }