修改权限逻辑

gonglilong

2024-11-11 e610dbf131729194519ae1ebb63f4c4d613c41a0

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

@@ -78,14 +78,16 @@
            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){
//               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);
@@ -95,7 +97,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);
               }

@@ -119,14 +122,16 @@
            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){
//               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);
@@ -136,7 +141,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);
               }

@@ -210,7 +216,7 @@
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
      wrapper.in("status",Arrays.asList(0,1,2,3));
      if(sgProgressReportDO.getGxDeviceId()==998
         //|| sgProgressReportDO.getGxDeviceId()==999
         || sgProgressReportDO.getGxDeviceId()==999
      ){
         wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
      }else {
@@ -338,7 +344,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();
@@ -347,7 +354,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);
         }

@@ -516,6 +524,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);
   }

@@ -532,14 +587,16 @@
            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){
//               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);
@@ -549,7 +606,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);
               }

@@ -677,14 +735,16 @@
            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){
//               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);
@@ -694,7 +754,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);
               }

@@ -711,17 +772,23 @@
    * 设置部门单位查询条件
    */
   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)){
         if(roleId.equals(1800820855352672257L)){
            searchDTO.setUserUnit(longList);
         }else{
         }

         if(roleId.equals(1811657352658042882L)) {
            searchDTO.setCountryUnit(longList);
         }

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

         }
      }
   }