湖北水库：修复项目进度报错

shenyijian

2024-10-31 0daf60dc7bd51091b64639e656686c611926a86f

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

@@ -14,8 +14,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,11 +50,14 @@
   @Autowired
   private SgGxStepMapper sgGxStepMapper;

   @Autowired
   private SgProgressReportServiceImpl sgProgressReportService;

   @Override
   public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
      List<String> sgCodeS = getSgCodeByUser();
      searchDTO.setSgCodeS(sgCodeS);
//      setDeptId(searchDTO);
      setAdCode(searchDTO);
      Boolean isPage = searchDTO.getIsPage();
      if (isPage==null) isPage = true;
      if (isPage ){
@@ -82,34 +87,25 @@
         }
         sgProjectInfoDOS.forEach(s->{
            //土建
            if (StringUtils.isNotBlank(s.getConstructionUnit())){
               s.setConstructionUnit(deptMap.get(Long.valueOf(s.getConstructionUnit())));
            }
            s.setConstructionPerson(getUserNames(userMap, s.getConstructionPerson()));
            String constructionUnit = s.getConstructionUnit();
            s.setConstructionUnit(getUserOrDeptNames(deptMap,s.getConstructionUnit()));
            s.setConstructionPerson(getUserOrDeptNames(userMap, s.getConstructionPerson()));

            //设备
            if (StringUtils.isNotBlank(s.getSelfUnit())){
               s.setSelfUnit(deptMap.get(Long.valueOf(s.getSelfUnit())));
            }
            s.setSelfPerson(getUserNames(userMap, s.getSelfPerson()));
            s.setSelfUnit(getUserOrDeptNames(deptMap,s.getSelfUnit()));
            s.setSelfPerson(getUserOrDeptNames(userMap, s.getSelfPerson()));

            //设计
            if (StringUtils.isNotBlank(s.getDesignUnit())){
               s.setDesignUnit(deptMap.get(Long.valueOf(s.getDesignUnit())));
            }
            s.setDesignPerson(getUserNames(userMap, s.getDesignPerson()));
            s.setDesignUnit(getUserOrDeptNames(deptMap, s.getDesignUnit()));
            s.setDesignPerson(getUserOrDeptNames(userMap, s.getDesignPerson()));

            //监理
            if (StringUtils.isNotBlank(s.getControlUnit())){
               s.setControlUnit(deptMap.get(Long.valueOf(s.getControlUnit())));
            }
            s.setControlPerson(getUserNames(userMap, s.getControlPerson()));
            s.setControlUnit(getUserOrDeptNames(deptMap, s.getControlUnit()));
            s.setControlPerson(getUserOrDeptNames(userMap, s.getControlPerson()));

            //检测
            if (StringUtils.isNotBlank(s.getAcceptanceUnit())){
               s.setAcceptanceUnit(deptMap.get(Long.valueOf(s.getAcceptanceUnit())));
            }
            s.setAcceptancePerson(getUserNames(userMap, s.getAcceptancePerson()));
            s.setAcceptanceUnit(getUserOrDeptNames(deptMap, s.getAcceptanceUnit()));
            s.setAcceptancePerson(getUserOrDeptNames(userMap, s.getAcceptancePerson()));
         });
         return sgProjectInfoDOS;
      }
@@ -129,21 +125,20 @@
   }

   /**
    * 获取用户姓名
    * @param userMap
    * 获取用户或者部门姓名
    * @return
    */
   private  String getUserNames(Map<Long, String> userMap,String person ) {
      String userNames = "";
      if (StringUtils.isNotBlank(person)){
   private  String getUserOrDeptNames(Map<Long, String> map, String param ) {
      String result = "";
      if (StringUtils.isNotBlank(param)){
         // 使用Stream API来处理分割和映射
          userNames = Arrays.stream(person.split(",")) // 将字符串按逗号分割成数组，并转为Stream
         result = Arrays.stream(param.split(",")) // 将字符串按逗号分割成数组，并转为Stream
            .map(Long::valueOf) // 将每个字符串元素转换为Long
            .map(userMap::get) // 使用userMap将Long映射为对应的用户名
            .map(map::get) // 使用userMap将Long映射为对应的用户名
            .collect(Collectors.joining(",")); // 使用逗号将用户名拼接成一个字符串
         return userNames;
         return result;
      }
      return userNames;
      return result;
   }

   /**
@@ -167,7 +162,7 @@
   public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) {
      List<PreAcceVO>  palist = new ArrayList<>();
      List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO);
      palist.add(handleQuery(25, list.get(0).getId()));
      palist.add(handleQuery(20, list.get(0).getId()));
      palist.add(handleQuery(26, list.get(0).getId()));
      List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
      projectProgress.forEach(s->{
@@ -185,8 +180,11 @@
    */
   @NotNull
   public List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) {
      List<SgProjectInfoVO> sortedList = list.stream()
         .sorted(Comparator.comparing(SgProjectInfoVO::getSort))
         .collect(Collectors.toList());
      //项目分组
      Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
      Map<Long, List<SgProjectInfoVO>> projectMap = sortedList.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
      List<SgProjectInfoDO> result = new ArrayList<>();
      for (Map.Entry<Long, List<SgProjectInfoVO>> entry : projectMap.entrySet()) {
         List<SgDeviceDO> allDevice = new ArrayList<>();
@@ -215,16 +213,18 @@
               if (CollectionUtils.isEmpty(gxList)){
                  continue;
               }
               gxList = list.stream().sorted(Comparator.comparing(SgProjectInfoVO::getPrice)).collect(Collectors.toList());
               SgTypeVO typeVO = SgTypeVO.builder().typeName(gxList.get(0).getTypeName()).build();
               List<SgDeviceDO> deviceDOS = new ArrayList<>();
               //设备分组
               Map<Long, List<SgProjectInfoVO>> dMap = gxList.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getDId));
               Map<Long, List<SgProjectInfoVO>> dMap = gxList.stream().filter(s->s.getDId()!=null).collect(Collectors.groupingBy(SgProjectInfoVO::getDId));
               for (Map.Entry<Long, List<SgProjectInfoVO>> device : dMap.entrySet()) {
                  Long dId = device.getKey();
                  List<SgProjectInfoVO> deList = device.getValue();
                  SgDeviceDO sgDeviceDO = new SgDeviceDO();
                  sgDeviceDO.setId(dId);
                  sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
                  sgDeviceDO.setPrice(deList.get(0).getPrice());
                  List<SgGxStepDO> stepDOS = deList.stream().filter(s -> s.getReportStatus() == null || (s.getReportStatus() != 4 && !(s.getReportStatus() == 3 && s.getResubmit() != 0))).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList());
                  List<SgGxStepDO> stepOver = stepDOS.stream().filter(s -> s.getApprovalStatus() != null && s.getApprovalStatus() == 2).collect(Collectors.toList());
                  BigDecimal stepSize = BigDecimal.valueOf(stepDOS.size());
@@ -244,7 +244,8 @@
               double sum = deviceDOS.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
               BigDecimal deviceOver = BigDecimal.valueOf(sum);
               BigDecimal divideDevice = deviceOver.divide(deviceSize, 2, RoundingMode.HALF_UP);
               typeVO.setDeviceDOS(deviceDOS);
               List<SgDeviceDO> sortDeviceDOs = deviceDOS.stream().filter(s->s.getPrice()!=null).sorted(Comparator.comparing(SgDeviceDO::getPrice)).collect(Collectors.toList());
               typeVO.setDeviceDOS(sortDeviceDOs);
               typeVO.setTypeProgress(getBigDecimalPercent(divideDevice));
               typeVO.setProgress(divideDevice.toString());
               sgGxDOS.add(typeVO);
@@ -413,12 +414,16 @@
            SgOperatingRateVO sVo = deviceTypes.get(vo.getProIds());
            if (Objects.nonNull(sVo)){
               vo.setSurfaceNum(sVo.getSurfaceNum());
               vo.setSurfaceStartNum(sVo.getSurfaceStartNum());
               vo.setSurfaceProgress(sVo.getSurfaceProgress());
               vo.setVideoNum(sVo.getVideoNum());
               vo.setVideoStartNum(sVo.getVideoStartNum());
               vo.setVideoProgress(sVo.getVideoProgress());
               vo.setTransNum(sVo.getTransNum());
               vo.setTransStartNum(sVo.getTransStartNum());
               vo.setTransProgress(sVo.getTransProgress());
               vo.setSeepageNum(sVo.getSeepageNum());
               vo.setSeepageStartNum(sVo.getSeepageStartNum());
               vo.setSeepageProgress(sVo.getSeepageProgress());
            }
         }
@@ -470,6 +475,7 @@
                  Integer deviceCount = sg108.getDeviceCount();
                  Integer deviceStart = sg108.getDeviceStart();
                  sgOperatingRateVO.setSurfaceNum(deviceCount);
                  sgOperatingRateVO.setSurfaceStartNum(deviceStart);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
@@ -483,6 +489,7 @@
                  Integer deviceCount = sg104.getDeviceCount();
                  Integer deviceStart = sg104.getDeviceStart();
                  sgOperatingRateVO.setVideoNum(deviceCount);
                  sgOperatingRateVO.setVideoStartNum(deviceStart);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setVideoProgress(getBigDecimalPercent(divide));
@@ -496,6 +503,7 @@
                  Integer deviceCount = sg101.getDeviceCount();
                  Integer deviceStart = sg101.getDeviceStart();
                  sgOperatingRateVO.setTransNum(deviceCount);
                  sgOperatingRateVO.setTransStartNum(deviceStart);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setTransProgress(getBigDecimalPercent(divide));
@@ -509,6 +517,7 @@
                  Integer deviceCount = sg102.getDeviceCount();
                  Integer deviceStart = sg102.getDeviceStart();
                  sgOperatingRateVO.setSeepageNum(deviceCount);
                  sgOperatingRateVO.setSeepageStartNum(deviceStart);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
@@ -671,7 +680,7 @@
         SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(stepIdForNull);
         preAcceVO.setName(sgGxStepDO.getGxStepName());
         preAcceVO.setProgramId(programId);
         preAcceVO.setGxDeviceId(stepIdForNull != 25? (long)998:(long)999);
         preAcceVO.setGxDeviceId(stepIdForNull != 20? (long)998:(long)999);
         preAcceVO.setGxStepId(sgGxStepDO.getId());

      }
@@ -684,6 +693,7 @@
   public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) {
      List<String> sgCodeS = getSgCodeByUser();
      dto.setSgCodeS(sgCodeS);
      setAdCode(dto);
      List<SgProjectTreeVO> list =    sgProjectInfoMapper.projectTree(dto);
      if (CollectionUtils.isNotEmpty(list)){
         list.forEach(x->{
@@ -768,9 +778,38 @@
               provinceNode.setChildList(provinceChildren);
               tree.add(provinceNode);
            }
            return tree;
         List<SgProjectTreeVO> childList = tree.get(0).getChildList();
         List<SgProjectTreeVO> collect = childList.stream()
            .sorted(Comparator.comparing(s -> {
               String scode = s.getRegionName();
               if (scode.equals("第一标段")) {
                  return 1;
               } else if (scode.equals("第二标段")) {
                  return 2;
               } else if (scode.equals("第三标段")) {
                  return 3;
               } else if (scode.equals("第四标段")) {
                  return 4;
               } else if (scode.equals("第五标段")) {
                  return 5;
               } else {
                  return Integer.MAX_VALUE;
               }
            }))
            .collect(Collectors.toList());
         tree.get(0).setChildList(collect);
         return tree;

      }
      return new ArrayList<>();
   }

   private void setAdCode(ProjectSearchDTO dto) {
      String deptId = AuthUtil.getDeptId();
      Long roleId = sgProgressReportService.getRoleId();
      if(roleId.equals(1811657352658042882L)){
         dto.setAdCode(deptId);
      }
   }

   @Override
@@ -780,4 +819,18 @@
      return page.setRecords(baseMapper.resList(page,dto));
   }

   @Override
   @Transactional
   public void delete(String ids) {
      List<String> list = Arrays.asList(ids.split(","));
      list.forEach(id->{
         List<SgProgressReportDO> reportDOS = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId, id).list();
         if (CollectionUtils.isNotEmpty(reportDOS)){
            SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(id);
            throw new ServiceException(sgProjectInfoDO.getProjectName() + "存在施工审批，无法删除！");
         }
         sgProjectInfoMapper.deleteById(id);
      });
   }

}