湖北水库：项目下拉列表过滤

shenyijian

2024-09-18 7f3b30605ca7a30a0e5b5f4772e451a244db50f2

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -387,13 +387,13 @@
         updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
         Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
         //工序审核完成后 进行项目和设备状态的判断
         cachedThreadPool.execute(new Runnable(){
            @Override
            public  void  run(){
//         cachedThreadPool.execute(new Runnable(){
//            @Override
//            public  void  run(){
               setProgramAndDeviceStatus(proframId);

            }
         });
//
//            }
//         });
         Long projectID = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
         setProgramProgress(projectID);
      }
@@ -506,9 +506,14 @@
            SgOperatingRateVO vo = deviceTypes.get(projectId.toString());
            if (Objects.nonNull(vo)){
               project.setSurfaceProgress(vo.getSurfaceProgress());
               project.setSurfaceNum(vo.getSurfaceNum());
               project.setVideoProgress(vo.getVideoProgress());
               project.setVideoNum(vo.getVideoNum());
               project.setTransProgress(vo.getTransProgress());
               project.setTransNum(vo.getTransNum());
               project.setSeepageProgress(vo.getSeepageProgress());
               project.setSeepageNum(vo.getSeepageNum());
               sgProjectInfoMapper.updateById(project);
            }
         }
      }
@@ -526,6 +531,8 @@
      if(!user.getRoleId().equals("1811657352658042882")){

         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }else{
         searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
      }
      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
      //searchDTO.setUserId(userId);
@@ -571,6 +578,8 @@
      if(!user.getRoleId().equals("1811657352658042882")){

         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }else{
         searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
      }

      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
@@ -652,6 +661,8 @@
      //判断是不是县级建办  否的话就是监理单位下人员进行
      if(!user.getRoleId().equals("1811657352658042882")){
         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }else{
         searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
      }
      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
//      if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){