From 5ca0c88988c4f58dc6f1115139e8d7db41cf1a7d Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 18 Apr 2022 15:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 23 ++- .../mapper/ProjectRelatedPersonnelMapper.java | 9 +- .../xml/ProjectRelatedPersonnelMapper.xml | 22 +++ .../ProjectRelatedPersonnelServiceImpl.java | 161 +++++++++++++++--- 4 files changed, 180 insertions(+), 35 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 80a2506c5..56ea2171d 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 @@ -1,25 +1,24 @@ package com.jero.modules.project.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectRelatedPersonnelService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** 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 d424e2744..602bce8ad 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 @@ -1,10 +1,10 @@ package com.jero.modules.project.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.project.entity.ProjectRelatedPersonnel; + +import java.util.Map; /** * @Description: 相关人员维护表 @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectRelatedPersonnelMapper extends BaseMapper { + IPage queryPageList(IPage page, Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index d3ed81487..b674101bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -14,4 +14,26 @@ + \ No newline at end of file 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 3025d2997..b8372d089 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 @@ -1,15 +1,23 @@ package com.jero.modules.project.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import java.util.Map; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 项目库-相关人员维护表 @@ -19,6 +27,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl implements IProjectRelatedPersonnelService { + @Autowired + private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper; + + @Autowired + private SysUserMapper sysUserMapper; /** * 保存 @@ -27,12 +40,15 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryList() { - return list(); - } + public List queryList() { + return list(); + } + /** + * 分页列表查询 + * + * @return + */ @Override public IPage queryPageList(Map params) { - return null; + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + IPage result = projectRelatedPersonnelMapper.queryPageList(page, params); + List records = result.getRecords(); + disposeData(records); + return result; } + public void disposeData(List records) { + for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { + //法规工程师 + List lawEngineerUsers = new ArrayList<>(); + List lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(",")); + if (CollectionUtils.isNotEmpty(lawEngineerIdList)) { + lawEngineerIdList = lawEngineerIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", lawEngineerIdList); + lawEngineerUsers = sysUserMapper.selectList(userqueryWrapper); + } + if(CollectionUtils.isNotEmpty(lawEngineerUsers)) { + String lawEngineerId = projectRelatedPersonnel.getLawEngineer(); + String lawEngineerName = null; + String lawEngineerEnName = null; + StringBuilder certificationName = new StringBuilder(); + + for (String data : lawEngineerIdList) { + if (StringUtils.isNotEmpty(lawEngineerId)) { + lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); + lawEngineerEnName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } + + certificationName.append(lawEngineerName).append("(").append(lawEngineerEnName).append(")").append(" "); + + } + projectRelatedPersonnel.setLawEngineerName(certificationName.toString()); + } + + + //工程接口人 + List engineeringInterfacePersonUsers = new ArrayList<>(); + List engineeringInterfacePersonIdList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePerson().split(",")); + if (CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList)) { + engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", engineeringInterfacePersonIdList); + engineeringInterfacePersonUsers = sysUserMapper.selectList(userqueryWrapper); + } + if(CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) { + String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson(); + String engineeringInterfacePersonName = null; + String engineeringInterfacePersonEnName = null; + StringBuilder certificationName = new StringBuilder(); + + for (String data : engineeringInterfacePersonIdList) { + if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) { + engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); + engineeringInterfacePersonEnName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } + + certificationName.append(engineeringInterfacePersonName).append("(").append(engineeringInterfacePersonEnName).append(")").append(" "); + + } + projectRelatedPersonnel.setEngineeringInterfacePersonName(certificationName.toString()); + } + + //认证工程师 + List certificationEngineerUsers = new ArrayList<>(); + List certificationEngineerIdList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineer().split(",")); + if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) { + certificationEngineerIdList=certificationEngineerIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", certificationEngineerIdList); + certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper); + } + if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) { + String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer(); + String certificationEngineerName=null; + String certificationEngineerEnName=null; + StringBuilder certificationName=new StringBuilder(); + + for (String data:certificationEngineerIdList){ + if (StringUtils.isNotEmpty(certificationEngineerId)) { + certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); + certificationEngineerEnName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } + + certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" "); + + } + projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString()); + + } + + } + } + }