湖北水库项目
blame | history | patch | commit | commitdiff | ignore whitespace
shenyijian
2024-11-01 3fc0f776935df883ee0c8d89c572fc8855b791e8 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java


@@ -203,7 +203,7 @@


            if (CollectionUtils.isEmpty(ptyValue)){


               continue;


            }


            PtypeVO ptypeVO = PtypeVO.builder().pTypeName(ptyValue.get(0).getPtypeName()).build();


            PtypeVO ptypeVO = PtypeVO.builder().pTypeName(ptyValue.get(0).getPtypeName()).sort(ptyValue.get(0).getSort()).build();


            List<SgTypeVO> sgGxDOS = new ArrayList<>();


            //类型分组


            Map<String, List<SgProjectInfoVO>> GxMap = ptyValue.stream().filter(s->s.getDeviceType()!=null).collect(Collectors.groupingBy(SgProjectInfoVO::getDeviceType));


@@ -213,8 +213,8 @@


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


               gxList = gxList.stream().sorted(Comparator.comparing(SgProjectInfoVO::getPrice)).collect(Collectors.toList());


               SgTypeVO typeVO = SgTypeVO.builder().typeName(gxList.get(0).getTypeName()).sort(gxList.get(0).getDSort()).build();


               List<SgDeviceDO> deviceDOS = new ArrayList<>();


               //设备分组


               Map<Long, List<SgProjectInfoVO>> dMap = gxList.stream().filter(s->s.getDId()!=null).collect(Collectors.groupingBy(SgProjectInfoVO::getDId));


@@ -255,6 +255,7 @@


            BigDecimal sgGxOver = BigDecimal.valueOf(sum);


            BigDecimal divideSgGx = sgGxOver.divide(sgGxSize, 2, RoundingMode.HALF_UP);


            ptypeVO.setPTypeProgress(getBigDecimalPercent(divideSgGx));


            sgGxDOS = sgGxDOS.stream().sorted(Comparator.comparing(SgTypeVO::getSort)).collect(Collectors.toList());


            ptypeVO.setSgTypeVOS(sgGxDOS);


            pTypes.add(ptypeVO);


         }


@@ -263,7 +264,8 @@


            double sum = allDevice.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();


            BigDecimal allDeviceOver = BigDecimal.valueOf(sum);


            BigDecimal allDivideDevice = allDeviceOver.divide(allDeviceSize, 2, RoundingMode.HALF_UP);


            sgProjectInfoDO.setPtypeVOS(pTypes);


            List<PtypeVO> sortPtpes = pTypes.stream().sorted(Comparator.comparing(PtypeVO::getSort)).collect(Collectors.toList());


            sgProjectInfoDO.setPtypeVOS(sortPtpes);


            sgProjectInfoDO.setProjectProgress( getBigDecimalPercent(allDivideDevice));


            sgProjectInfoDO.setProjectProgressNum(allDivideDevice);


         }