Merge remote-tracking branch 'origin/jtdev' into jtdev

gonglilong

2024-09-14 df2ba3fd298fc349433c03290c6390a582b9c8b9

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

@@ -52,6 +52,7 @@
   public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
      List<String> sgCodeS = getSgCodeByUser();
      searchDTO.setSgCodeS(sgCodeS);
//      setDeptId(searchDTO);
      Boolean isPage = searchDTO.getIsPage();
      if (isPage==null) isPage = true;
      if (isPage ){
@@ -61,7 +62,7 @@
            Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
            sgProjectInfoDOS.forEach(s->{
               s.setProjectProgress(progressMap.get(s.getId()));
               setPercentage(s);
//               setPercentage(s);
            });
         }
         return page.setRecords(sgProjectInfoDOS);
@@ -76,7 +77,7 @@
            Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
            sgProjectInfoDOS.forEach(s->{
               s.setProjectProgress(progressMap.get(s.getId()));
               setPercentage(s);
//               setPercentage(s);
            });
         }
         sgProjectInfoDOS.forEach(s->{
@@ -120,10 +121,11 @@
    * @param s
    */
   private void setPercentage(SgProjectInfoDO s) {
      s.setSurfaceProgress(s.getSurfaceProgress()==null?null:s.getSurfaceProgress()+"%");
      s.setVideoProgress(s.getVideoProgress()==null?null:s.getVideoProgress()+"%");
      s.setTransProgress(s.getTransProgress()==null?null:s.getTransProgress()+"%");
      s.setSeepageProgress(s.getSeepageProgress()==null?null:s.getSeepageProgress()+"%");
      s.setSurfaceProgress(StringUtils.isNotBlank(s.getSurfaceProgress()) ?null:s.getSurfaceProgress()+"%");
      s.setVideoProgress(StringUtils.isNotBlank(s.getVideoProgress())?null:s.getVideoProgress()+"%");
      s.setTransProgress(StringUtils.isNotBlank(s.getTransProgress())?null:s.getTransProgress()+"%");
      s.setSeepageProgress(StringUtils.isNotBlank(s.getSeepageProgress())?null:s.getSeepageProgress()+"%");
      s.setProjectAddress(StringUtils.isNotBlank(s.getProjectProgress())?null:s.getProjectProgress()+"%");
   }

   /**
@@ -301,6 +303,7 @@
    */
   @Override
   public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
//      setDeptId(searchDTO);
      List<SgProjectInfoVO> list = new ArrayList<>();
         if(StringUtils.isNotBlank(searchDTO.getAdCode())){
            list =   sgProjectInfoMapper.progressList1(page, searchDTO);
@@ -334,7 +337,20 @@
   public List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO) {
      List<String> sgCodeS = getSgCodeByUser();
      searchDTO.setSgCodeS(sgCodeS);
      return sgProjectInfoMapper.queryPageList(null,searchDTO);
      setDeptId(searchDTO);
      List<SgProjectInfoDO> list = sgProjectInfoMapper.queryPageList(null, searchDTO);
      return list;
   }

   /**
    * setDeptId
    * @param searchDTO
    */
   private  void setDeptId(ProjectSearchDTO searchDTO) {
      String deptId = AuthUtil.getDeptId();
      if (!deptId.equals("420000000000")){
         searchDTO.setDeptId(deptId);
      }
   }

   /**
@@ -394,13 +410,13 @@
            SgOperatingRateVO sVo = deviceTypes.get(vo.getProIds());
            if (Objects.nonNull(sVo)){
               vo.setSurfaceNum(sVo.getSurfaceNum());
               vo.setSurfaceProgress(sVo.getSurfaceProgress()==null?null:sVo.getSurfaceProgress()+"%");
               vo.setSurfaceProgress(sVo.getSurfaceProgress());
               vo.setVideoNum(sVo.getVideoNum());
               vo.setVideoProgress(sVo.getVideoProgress()==null?null:sVo.getVideoProgress()+"%");
               vo.setVideoProgress(sVo.getVideoProgress());
               vo.setTransNum(sVo.getTransNum());
               vo.setTransProgress(sVo.getTransProgress()==null?null:sVo.getTransProgress()+"%");
               vo.setTransProgress(sVo.getTransProgress());
               vo.setSeepageNum(sVo.getSeepageNum());
               vo.setSeepageProgress(sVo.getSeepageProgress()==null?null:sVo.getSeepageProgress()+"%");
               vo.setSeepageProgress(sVo.getSeepageProgress());
            }
         }
      }
@@ -595,7 +611,7 @@
      BigDecimal percentage = bigDecimal.multiply(new BigDecimal("100"));
      // 如果不需要保留小数位，可以设置一个scale为0
      BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
      return percentageRounded.toString();
      return percentageRounded+"%";
   }

   @Override