项目库-相关人员-增加认证工程师查询接口
This commit is contained in:
+14
@@ -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<ProjectRel
|
||||
Map<String, Object> 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<SysUser> certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId);
|
||||
return Result.OK(certificationEngineerList);
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -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<ProjectRelated
|
||||
|
||||
ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory);
|
||||
|
||||
List<SysUser> queryCertificationEngineer(String projectId);
|
||||
}
|
||||
|
||||
+25
@@ -759,4 +759,29 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
updateById(projectRelatedPersonnel);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysUser> queryCertificationEngineer(String projectId) {
|
||||
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
|
||||
List<ProjectRelatedPersonnel> list = list(queryWrapper.eq("project_id",projectId));
|
||||
|
||||
List<String> certificationEngineerList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList());
|
||||
|
||||
StringBuilder userIdBuilder=new StringBuilder();
|
||||
List<SysUser> 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<SysUser> userqueryWrapper = new QueryWrapper<>();
|
||||
userqueryWrapper.in("id ", userIdList);
|
||||
certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper);
|
||||
}
|
||||
return certificationEngineerUsers;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user