湖北水库：待办列表过滤

shenyijian

2024-09-26 d828ab62ba9c8d3185f9001413216ad82e99148d

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

@@ -510,12 +510,7 @@
   public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
      BladeUser user = AuthUtil.getUser();
      Long roleId = getRoleId();
      if(!roleId.equals(1811657352658042882L)){

         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }else{
         searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
      }
      setUnit(searchDTO,user,roleId);
      searchDTO.setRoleUnit(roleId);
      //searchDTO.setUserId(userId);
      List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
@@ -558,12 +553,7 @@
   public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
      BladeUser user = AuthUtil.getUser();
      Long roleId = getRoleId();
      if(!roleId.equals(1811657352658042882L)){

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

      searchDTO.setRoleUnit(roleId);
      //searchDTO.setUserId(userId);
@@ -659,12 +649,7 @@
   public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      BladeUser user = AuthUtil.getUser();
      Long roleId = getRoleId();
      //判断是不是县级建办  否的话就是监理单位下人员进行
      if(!roleId.equals(1811657352658042882L)){
         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }else{
         searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
      }
      setUnit(searchDTO, user, roleId);
      searchDTO.setRoleUnit(roleId);
//      if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
//         searchDTO.setAuditPerson(String.valueOf(userId));
@@ -705,6 +690,24 @@
      return page.setRecords(list);
   }

   /**
    * 设置部门单位查询条件
    */
   private  void setUnit(ProjectSearchDTO searchDTO, BladeUser user, Long roleId) {
      List<Long> longList = Arrays.stream(user.getDeptId().split(","))
         .map(Long::parseLong)
         .collect(Collectors.toList());
      //判断是不是省厅建办  否的话就不设置部门
      if (!roleId.equals(1800820667082948610L)){
         //判断是不是县级建办  否的话就是监理单位下人员进行
         if(!roleId.equals(1811657352658042882L)){
            searchDTO.setUserUnit(longList);
         }else{
            searchDTO.setCountryUnit(longList);
         }
      }
   }

   @Override
   public String getDeviceReport(Long gxDeviceId, Long gxStepId) {
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();