湖北水库：审批bug解决

shenyijian

2024-11-02 fb53b3101bd5953465a2b35aa543daefb8395247

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

@@ -78,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){
@@ -95,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);
               }

@@ -119,7 +121,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){
@@ -136,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);
               }

@@ -338,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();
@@ -347,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);
         }

@@ -532,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){
@@ -549,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);
               }

@@ -677,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){
@@ -694,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);
               }

@@ -711,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);
         }
      }