Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-11-26 b672cafe6a447c9b19691b583df9542ad84bce2c

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

@@ -82,11 +82,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }


            s.setUserIDs(resultUsers);
@@ -125,11 +126,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }


            s.setUserIDs(resultUsers);
@@ -316,8 +318,11 @@
      sgProgressReportVO.setDeviceName("");}
      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> idsCounty = list.stream().filter(s->s.getRoleId().equals(1811657352658042882L)).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>> usersCounty = sgProgressReportMapper.getUserByIdsCounty(idsCounty);
      users.addAll(usersCounty);
      List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);

      for (Map<String, Object> user : users) {
@@ -522,6 +527,53 @@

   @Override
   public void updateReport(SgProgressReportDO sgProgressReportDO) {
      Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
      Long gxStepId = sgProgressReportDO.getGxStepId();
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
      QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
      wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位");
      List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers);

      if(sgProgressReportDO.getGxDeviceId()==998){
         ProjectSearchDTO search = new ProjectSearchDTO();
         search.setProjectId(sgProgressReportDO.getProframId().toString());
         List<SgProjectInfoVO> sgProjectInfoVOS = sgProjectInfoMapper.queryStepByProject(search);
         if(sgProjectInfoVOS != null){
            sgProjectInfoVOS.forEach(s ->{
               if(!s.getProjectStatus().equals(2)){
                  throw new ServiceException("请完成所有设备工序审批!");
               }
            });
         }else{
            throw new ServiceException("无设备审批数据！");
         }

      }

      if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
         for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
            if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3)  {
               throw new ServiceException("请先完成测量定位的审批!");
            }
         }
      } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) {
         throw new ServiceException("请先发起测量定位的审批!");
      }

      for (SgGxStepDO gxStepDO : list) {
         if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) >= 1) {
            QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
            wrapper1.eq("gx_step_id", gxStepDO.getId());
            wrapper1.eq("gx_device_id",gxDeviceId);
            wrapper1.ne("status",4);
            wrapper1.ne("status",3);
            SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
            if (one == null || one.getStatus() != 2) {
               throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
            }
         }
      }
      sgProgressReportMapper.updateById(sgProgressReportDO);
   }

@@ -542,11 +594,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }


            s.setUserIDs(resultUsers);
@@ -689,11 +742,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }


            s.setUserIDs(resultUsers);
@@ -726,7 +780,7 @@
      //判断是不是省厅建办  否的话就不设置部门
      if (!roleId.equals(1800820667082948610L)){
         //判断是不是县级建办  否的话就是监理单位下人员进行
         if(roleId.equals(1710904523971129345L)){
         if(roleId.equals(1800820855352672257L)){
            searchDTO.setUserUnit(longList);
         }

@@ -734,8 +788,9 @@
            searchDTO.setCountryUnit(longList);
         }

         if(roleId==1800818489547112450L){
         if(roleId.equals(1800818489547112450L)){
            searchDTO.setSelfUnit(longList);

         }
      }
   }