修改我的审核和代办数量流程逻辑

gonglilong

2024-09-14 caf24ff51f39e8026cd1f6d15b8258a6bdc3d997

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

@@ -72,14 +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> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
            List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
            String selfUnit = sgProjectInfoDO.getSelfUnit();
            List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
            users.addAll(selfUnitusers);
            s.setUserIDs(users);
               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);
               }

            }


         });

      }
@@ -90,14 +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> resultUsers=new ArrayList<>();
            if(s.getControlUnit()!=null){
               String controlUnit = s.getControlUnit();
            List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
            String selfUnit = sgProjectInfoDO.getSelfUnit();
            List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
            users.addAll(selfUnitusers);
            s.setUserIDs(users);
               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);
               }

            }


         });

      }