skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java
@@ -44,4 +44,6 @@ List<SgReportUserDO> selectProcessUserByProjectId(@Param("programId") Long programId); List<Map<String, Object>> getRoleByIds(@Param("ids")List<Long> rids); List<Long> getSgEngineerRole(); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -240,4 +240,7 @@ </foreach> </if> </select> <select id="getSgEngineerRole" resultType="java.lang.Long"> select id from "YWXT"."BLADE_ROLE" where parent_id = 1800818080896073730; </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -69,6 +69,9 @@ <if test="dto.deptId != null and dto.deptId !=''"> and (info.control_unit = #{dto.deptId} or info.construction_unit = #{dto.deptId}) </if> <if test="dto.adCode != null and dto.adCode !=''"> and dria."county_cd" = #{dto.adCode} </if> <if test="dto.projectSort == null"> ORDER BY TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc </if> @@ -569,6 +572,9 @@ #{id} </foreach>) </if> <if test="dto.adCode != null and dto.adCode !=''"> and dria."county_cd" = #{dto.adCode} </if> </select> <select id="getUserS" resultType="java.lang.String">
@@ -354,7 +354,7 @@ Integer isReject = approvalDTO.getIsReject(); Long userId = approvalDTO.getUserId(); Long id = approvalDTO.getId(); String roleId = AuthUtil.getUser().getRoleId(); Long roleId = getRoleId(); QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>(); wrappers.eq("id", id); SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers); @@ -377,7 +377,7 @@ //审批者 SgReportUserDO sgReportUserDO = new SgReportUserDO(); if (isReject==1){ sgReportUserDO = SgReportUserDO.builder().reportId(approvalDTO.getId()).approvalOrder(sgReportUserDOS.get(sgReportUserDOS.size() - 1).getApprovalOrder()+1).roleId(Long.valueOf(roleId)).build(); sgReportUserDO = SgReportUserDO.builder().reportId(approvalDTO.getId()).approvalOrder(sgReportUserDOS.get(sgReportUserDOS.size() - 1).getApprovalOrder()+1).roleId(roleId).build(); sgReportUserMapper.insert(sgReportUserDO); }else { sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getRoleId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get(); @@ -511,13 +511,14 @@ @Override public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) { BladeUser user = AuthUtil.getUser(); if(!user.getRoleId().equals("1811657352658042882")){ Long roleId = getRoleId(); if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } searchDTO.setRoleUnit(Long.parseLong(user.getRoleId())); searchDTO.setRoleUnit(roleId); //searchDTO.setUserId(userId); List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO); if(list != null){ @@ -558,14 +559,15 @@ @Override public Map<String, Long> countList(ProjectSearchDTO searchDTO) { BladeUser user = AuthUtil.getUser(); if(!user.getRoleId().equals("1811657352658042882")){ Long roleId = getRoleId(); if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } searchDTO.setRoleUnit(Long.parseLong(user.getRoleId())); searchDTO.setRoleUnit(roleId); //searchDTO.setUserId(userId); //searchDTO.setAuditPerson(userId.toString()); List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO); @@ -638,16 +640,31 @@ return true; } public Long getRoleId(){ BladeUser user = AuthUtil.getUser(); List<String> userRole = Arrays.asList(user.getRoleId().split(",")); List<Long> roleList = sgProgressReportMapper.getSgEngineerRole(); Long roleId = null; for (String s : userRole) { long l = Long.parseLong(s); if (roleList.contains(l)){ roleId = l; } } return roleId; } @Override public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) { BladeUser user = AuthUtil.getUser(); Long roleId = getRoleId(); //判断是不是县级建办 否的话就是监理单位下人员进行 if(!user.getRoleId().equals("1811657352658042882")){ if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } searchDTO.setRoleUnit(Long.parseLong(user.getRoleId())); searchDTO.setRoleUnit(roleId); // if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){ // searchDTO.setAuditPerson(String.valueOf(userId)); // } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -7,6 +7,7 @@ import cn.gistack.sm.sg.mapper.SgGxStepMapper; import cn.gistack.sm.sg.mapper.SgProgressReportMapper; import cn.gistack.sm.sg.mapper.SgProjectInfoMapper; import cn.gistack.sm.sg.service.SgProgressReportService; import cn.gistack.sm.sg.service.SgProjectInfoService; import cn.gistack.sm.sjztmd.entity.AttAdBase; import cn.gistack.sm.sjztmd.service.IAttAdBaseService; @@ -48,11 +49,14 @@ @Autowired private SgGxStepMapper sgGxStepMapper; @Autowired private SgProgressReportServiceImpl sgProgressReportService; @Override public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) { List<String> sgCodeS = getSgCodeByUser(); searchDTO.setSgCodeS(sgCodeS); // setDeptId(searchDTO); setAdCode(searchDTO); Boolean isPage = searchDTO.getIsPage(); if (isPage==null) isPage = true; if (isPage ){ @@ -684,6 +688,7 @@ public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) { List<String> sgCodeS = getSgCodeByUser(); dto.setSgCodeS(sgCodeS); setAdCode(dto); List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree(dto); if (CollectionUtils.isNotEmpty(list)){ list.forEach(x->{ @@ -768,11 +773,40 @@ provinceNode.setChildList(provinceChildren); tree.add(provinceNode); } List<SgProjectTreeVO> childList = tree.get(0).getChildList(); List<SgProjectTreeVO> collect = childList.stream() .sorted(Comparator.comparing(s -> { String scode = s.getRegionName(); if (scode.equals("第一标段")) { return 1; } else if (scode.equals("第二标段")) { return 2; } else if (scode.equals("第三标段")) { return 3; } else if (scode.equals("第四标段")) { return 4; } else if (scode.equals("第五标段")) { return 5; } else { return Integer.MAX_VALUE; } })) .collect(Collectors.toList()); tree.get(0).setChildList(collect); return tree; } return new ArrayList<>(); } private void setAdCode(ProjectSearchDTO dto) { String deptId = AuthUtil.getDeptId(); Long roleId = sgProgressReportService.getRoleId(); if(!roleId.equals(1811657352658042882L)){ dto.setAdCode(deptId); } } @Override public IPage<ResVO> resList(IPage<ResVO> page, ProjectSearchDTO dto) { List<String> sgCodeByUser = getSgCodeByUser();
