湖北水库：新增上报修复

shenyijian

2024-09-14 ebb2b7790cd50297cf3dbbafcdda7f67971ca7a0

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

@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
@@ -71,11 +72,33 @@
      List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
      if(list != null){
         list.forEach(s ->{
            Long proframId = s.getProframId();
            SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
            String controlUnit = sgProjectInfoDO.getControlUnit();
            List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
            s.setUserIDs(users);
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }


            s.setUserIDs(resultUsers);
            String gxStepName = s.getGxStepName();
            String countyCd = s.getCountyCd();

            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  s.setXbUnitIDs(xbUnitIDs);
               }

            }


         });

      }
@@ -86,11 +109,33 @@
      List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
      if(list != null){
         list.forEach(s ->{
            Long proframId = s.getProframId();
            SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
            String controlUnit = sgProjectInfoDO.getControlUnit();
            List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
            s.setUserIDs(users);
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }


            s.setUserIDs(resultUsers);
            String gxStepName = s.getGxStepName();
            String countyCd = s.getCountyCd();

            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  s.setXbUnitIDs(xbUnitIDs);
               }

            }


         });

      }
@@ -193,8 +238,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());
      }else if(gxDeviceId == 998){
         deviceType = "sgys";
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
      }else {
          sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
         deviceType = sgDeviceDO.getDeviceType();
@@ -211,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());
@@ -250,7 +299,7 @@
         sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      }else {
      sgProgressReportVO.setDeviceName("");}
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getId).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) {
@@ -265,6 +314,23 @@
      List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
      sgStepReportVOS = sgStepReportVOS.stream().filter(s -> s.getApprovalStatus() == null || (s.getApprovalStatus() != 4 && !(s.getApprovalStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
      sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);

      if(sgProgressReportVO.getControlUnit()!=null){
         String controlUnit = sgProgressReportVO.getControlUnit();
         List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
         sgProgressReportVO.setUserIDs(users1);
      }
      String gxStepName = sgProgressReportVO.getGxStepName();
      String countyCd = sgProgressReportVO.getCountyCd();

      if("测量定位".equals(gxStepName)){

         if(countyCd!=null){
            List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
            sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
         }

      }
      return sgProgressReportVO;
   }

@@ -284,12 +350,15 @@
      SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers);

      //判断当前用户的角色是不是   工序配置的审核的角色

      List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
         .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType()).eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
      List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
      if (CollectionUtils.isEmpty(roIds)){
         throw new ServiceException("请完成工序角色配置！");
      Long gxDeviceId = sgProgressReportDOS1.getGxDeviceId();
      if (gxDeviceId != 998 && gxDeviceId != 999) {
         List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
//            .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType())
            .eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
         List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(roIds)){
            throw new ServiceException("请完成工序角色配置！");
         }
      }
      SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
      List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
@@ -332,6 +401,7 @@
         updateChainWrapper.set(SgProgressReportDO::getStatus,3);
         updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
         userUpdate.set(SgReportUserDO::getApprovalStatus,2);
         userUpdate.set(SgReportUserDO::getUserId,userId);
         if (isReject==1){
            userUpdate.set(SgReportUserDO::getUserId,userId);
         }
@@ -452,17 +522,60 @@

   @Override
   public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      BladeUser user = AuthUtil.getUser();
      if(!user.getRoleId().equals("1811657352658042882")){

         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }
      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
      //searchDTO.setUserId(userId);
      List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
      if(list != null){
         list.forEach(s ->{
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }


            s.setUserIDs(resultUsers);
            String gxStepName = s.getGxStepName();
            String countyCd = s.getCountyCd();

            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  s.setXbUnitIDs(xbUnitIDs);
               }

            }


         });

      }
      return list;
   }

   @Override
   public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      searchDTO.setAuditPerson(userId.toString());
      BladeUser user = AuthUtil.getUser();
      if(!user.getRoleId().equals("1811657352658042882")){

         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }

      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
      //searchDTO.setUserId(userId);
      //searchDTO.setAuditPerson(userId.toString());
      List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
      searchDTO.setApprovalStatus(0);
      List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
@@ -535,12 +648,48 @@

   @Override
   public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
         searchDTO.setAuditPerson(String.valueOf(userId));
      BladeUser user = AuthUtil.getUser();
      //判断是不是县级建办  否的话就是监理单位下人员进行
      if(!user.getRoleId().equals("1811657352658042882")){
         searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
      }
      searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
//      if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
//         searchDTO.setAuditPerson(String.valueOf(userId));
//      }
      List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
      if(list != null){
         list.forEach(s ->{
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }


            s.setUserIDs(resultUsers);
            String gxStepName = s.getGxStepName();
            String countyCd = s.getCountyCd();

            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  s.setXbUnitIDs(xbUnitIDs);
               }

            }


         });

      }
      return page.setRecords(list);
   }