全部加上单位对应的人员

gonglilong

2024-09-14 6d8c0503a6664abbc8b416705ec4d9705a62fc9d

 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);
               }

            }


         });

      }
@@ -452,17 +497,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 +623,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);
   }