湖北水库：审批bug解决

shenyijian

2024-11-02 fb53b3101bd5953465a2b35aa543daefb8395247

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

@@ -64,6 +64,9 @@
   @Autowired
   private SgProjectInfoServiceImpl sgProjectInfoService;

   @Autowired
   private SgGxMapper sgGxMapper;



   ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
@@ -75,7 +78,8 @@
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
@@ -92,7 +96,8 @@
            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  List<String> controlUnitS = Arrays.asList(countyCd.split(","));
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
                  s.setXbUnitIDs(xbUnitIDs);
               }

@@ -106,13 +111,18 @@
   }
   @Override
   public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      if (StringUtils.isNotBlank(searchDTO.getTypeName())){
         List<String> childType = sgGxMapper.childType(searchDTO.getTypeName());
         searchDTO.setChildTypeList(childType);
      }
      List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(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);
               List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
@@ -129,7 +139,8 @@
            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  List<String> controlUnitS = Arrays.asList(countyCd.split(","));
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
                  s.setXbUnitIDs(xbUnitIDs);
               }

@@ -145,6 +156,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();
      }
@@ -167,7 +179,7 @@

      }
      QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
      wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备");
      wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位");
      List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers);

      if(sgProgressReportDO.getGxDeviceId()==998){
@@ -189,11 +201,11 @@
      if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
         for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
            if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3)  {
               throw new ServiceException("请先完成施工准备的审批!");
               throw new ServiceException("请先完成测量定位的审批!");
            }
         }
      } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("施工准备"))) {
         throw new ServiceException("请先发起施工准备的审批!");
      } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) {
         throw new ServiceException("请先发起测量定位的审批!");
      }
      Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
      Long gxStepId = sgProgressReportDO.getGxStepId();
@@ -201,7 +213,9 @@
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
      wrapper.in("status",Arrays.asList(0,1,2,3));
      if(sgProgressReportDO.getGxDeviceId()==998 || sgProgressReportDO.getGxDeviceId()==999){
      if(sgProgressReportDO.getGxDeviceId()==998
         || sgProgressReportDO.getGxDeviceId()==999
      ){
         wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
      }else {
         wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4);
@@ -237,9 +251,10 @@
      String deviceType ="";
      SgDeviceDO sgDeviceDO = new SgDeviceDO();
      if (gxDeviceId == 999){
          deviceType = "sgzb";
          deviceType = "cldw";
         //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
      }else if(gxDeviceId == 998){
      }else
         if(gxDeviceId == 998){
         deviceType = "sgys";
         //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
      }else {
@@ -258,7 +273,7 @@
//      }
      //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());
         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());
@@ -274,14 +289,16 @@
      }

      //加个项目及设备的状态判断 方便统计计算
      if(gxStepId != 25 && gxStepId != 26 ) {
      if(gxStepId != 20 &&
         gxStepId != 26 ) {
         if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) {
            sgDeviceDO.setStatus(1);
            sgDeviceMapper.updateById(sgDeviceDO);
         }
      }
      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);
      }
@@ -325,7 +342,8 @@

      if(sgProgressReportVO.getControlUnit()!=null){
         String controlUnit = sgProgressReportVO.getControlUnit();
         List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
         List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
         List<String> users1=sgProjectInfoMapper.getUserS(controlUnitS);
         sgProgressReportVO.setUserIDs(users1);
      }
      String gxStepName = sgProgressReportVO.getGxStepName();
@@ -334,7 +352,8 @@
      if("测量定位".equals(gxStepName)){

         if(countyCd!=null){
            List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
            List<String> controlUnitS = Arrays.asList(countyCd.split(","));
            List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
            sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
         }

@@ -519,7 +538,8 @@
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
@@ -536,7 +556,8 @@
            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  List<String> controlUnitS = Arrays.asList(countyCd.split(","));
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
                  s.setXbUnitIDs(xbUnitIDs);
               }

@@ -575,6 +596,10 @@

   @Override
   public Map<String, Long> countListAll(ProjectSearchDTO searchDTO) {
      if (StringUtils.isNotBlank(searchDTO.getTypeName())){
         List<String> childType = sgGxMapper.childType(searchDTO.getTypeName());
         searchDTO.setChildTypeList(childType);
      }
      List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(null, searchDTO);
      Map<String, Long> map = new HashMap<>();
      getStatusCountByList(list, map);
@@ -660,7 +685,8 @@
            List<String> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
               List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
               List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
@@ -677,7 +703,8 @@
            if("测量定位".equals(gxStepName)){

               if(countyCd!=null){
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                  List<String> controlUnitS = Arrays.asList(countyCd.split(","));
                  List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
                  s.setXbUnitIDs(xbUnitIDs);
               }

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