湖北水库：解决审批上报错误

shenyijian

2024-09-30 2eaca6eee957d11234959153207c943deea77eae

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

@@ -145,6 +145,7 @@
   @Transactional
   public void add(SgProgressReportDO sgProgressReportDO) {
      String resubmitId = sgProgressReportDO.getResubmitId();
      Long roleId = getRoleId();
      if (StringUtils.isNotBlank(resubmitId)){
         new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId,resubmitId).set(SgProgressReportDO::getResubmit,1).update();
      }
@@ -238,10 +239,10 @@
      SgDeviceDO sgDeviceDO = new SgDeviceDO();
      if (gxDeviceId == 999){
          deviceType = "sgzb";
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
         //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
      }else if(gxDeviceId == 998){
         deviceType = "sgys";
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
         //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
      }else {
          sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
         deviceType = sgDeviceDO.getDeviceType();
@@ -258,9 +259,7 @@
//      }
      //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
      //新增审批记录
      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());
      }
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(roleId).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());
@@ -283,7 +282,8 @@
         }
      }
      SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(sgProgressReportDO.getProframId());
      if (sgProjectInfoDO != null && sgProjectInfoDO.getStatus() == 0) {
      Integer status = sgProjectInfoDO.getStatus();
      if (sgProjectInfoDO != null && ( Objects.isNull(status)||0 == status)) {
         sgProjectInfoDO.setStatus(1);
         sgProjectInfoMapper.updateById(sgProjectInfoDO);
      }
@@ -299,14 +299,24 @@
         sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      }else {
      sgProgressReportVO.setDeviceName("");}
      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<SgReportUserDO> list =  new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalOrder).list();
      List<Long> ids = list.stream().map(SgReportUserDO::getUserId).collect(Collectors.toList());
      List<Long> rids = list.stream().map(SgReportUserDO::getRoleId).collect(Collectors.toList());
      List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
      List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);

      for (Map<String, Object> user : users) {
         for (SgReportUserDO sgReportUserDO : list) {
            if (user.get("ID").equals(sgReportUserDO.getUserId())){
               sgReportUserDO.setUserName(user.get("REAL_NAME").toString());
               sgReportUserDO.setDeptName(user.get("DEPTNAME").toString());
            }
         }
      }
      for (Map<String, Object> r : roles) {
         for (SgReportUserDO sgReportUserDO : list) {
            if (r.get("ID").equals(sgReportUserDO.getRoleId())){
               sgReportUserDO.setRoleName(r.get("ROLENAME").toString());
            }
         }
      }
@@ -344,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);
@@ -367,7 +377,8 @@
      //审批者
      SgReportUserDO sgReportUserDO = new SgReportUserDO();
      if (isReject==1){
         sgReportUserDO = sgReportUserDOS.get(0);
         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();
      }
@@ -387,13 +398,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);
      }
@@ -402,35 +413,7 @@
         updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
         userUpdate.set(SgReportUserDO::getApprovalStatus,2);
         userUpdate.set(SgReportUserDO::getUserId,userId);
         if (isReject==1){
            userUpdate.set(SgReportUserDO::getUserId,userId);
         }
         userUpdate.update();
         /*for (SgReportUserDO reportUserDO : sgReportUserDOS) {
            if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
               //更新为历史数据
               new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
               setReportUser(date, reportUserDO);
               sgReportUserMapper.insert(reportUserDO);
               try {
                  Thread.sleep(100);
               } catch (InterruptedException e) {
                  throw new RuntimeException(e);
               }
            }else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
               sgReportUserMapper.deleteById(reportUserDO.getId());
               setReportUser(date, reportUserDO);
               sgReportUserMapper.insert(reportUserDO);
               try {
                  Thread.sleep(100);
               } catch (InterruptedException e) {
                  throw new RuntimeException(e);
               }
            }
            if (reportUserDO.getApprovalOrder()==1){
               updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
            }
         }*/
         updateChainWrapper.update();
      }

@@ -506,9 +489,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);
            }
         }
      }
@@ -523,11 +511,9 @@
   @Override
   public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
      BladeUser user = AuthUtil.getUser();
      if(!user.getRoleId().equals("1811657352658042882")){

         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }
      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
      Long roleId = getRoleId();
      setUnit(searchDTO,user,roleId);
      searchDTO.setRoleUnit(roleId);
      //searchDTO.setUserId(userId);
      List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
      if(list != null){
@@ -568,12 +554,10 @@
   @Override
   public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
      BladeUser user = AuthUtil.getUser();
      if(!user.getRoleId().equals("1811657352658042882")){
      Long roleId = getRoleId();
      setUnit(searchDTO,user,roleId);

         searchDTO.setUserUnit(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);
@@ -646,14 +630,29 @@
      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;
         }
      }
      if (Objects.isNull(roleId)){
         roleId = Long.parseLong(userRole.get(0));
      }
      return roleId;
   }

   @Override
   public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      BladeUser user = AuthUtil.getUser();
      //判断是不是县级建办  否的话就是监理单位下人员进行
      if(!user.getRoleId().equals("1811657352658042882")){
         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }
      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
      Long roleId = getRoleId();
      setUnit(searchDTO, user, roleId);
      searchDTO.setRoleUnit(roleId);
//      if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
//         searchDTO.setAuditPerson(String.valueOf(userId));
//      }
@@ -693,6 +692,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<>();