湖北水库：审批流程问题整改

shenyijian

2024-09-23 8d491a439cd84ec8667e140a853040e591107fdf

 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();