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

shenyijian

2024-09-18 7f3b30605ca7a30a0e5b5f4772e451a244db50f2

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

@@ -258,7 +258,9 @@
//      }
      //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
      //新增审批记录
      sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
      if (gxDeviceId != 998 && gxDeviceId != 999){
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
      }
      for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
         //sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
@@ -297,7 +299,7 @@
         sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      }else {
      sgProgressReportVO.setDeviceName("");}
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalTime).list();
      List<SgReportUserDO> list =  new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalTime).list();
      List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
      List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
      for (Map<String, Object> user : users) {
@@ -385,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);
      }
@@ -504,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);
            }
         }
      }
@@ -524,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);
@@ -569,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()));
@@ -650,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){