skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectInfoVO.java
@@ -33,4 +33,5 @@ private String PtypeName; private Integer resubmit; private Integer sort; private Integer dSort; } skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgTypeVO.java
@@ -17,5 +17,6 @@ private String typeName; private String typeProgress; private String progress; private Integer sort; private List<SgDeviceDO> deviceDOS; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -133,7 +133,8 @@ pro.lon_lat, re.resubmit, COALESCE(d.price, 99) as price, COALESCE(Pdict.sort, 0) as sort COALESCE(Pdict.sort, 0) as sort, COALESCE(dict.sort, 0) as dSort FROM ywxt.sg_project_info pro LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -214,7 +214,7 @@ continue; } gxList = gxList.stream().sorted(Comparator.comparing(SgProjectInfoVO::getPrice)).collect(Collectors.toList()); SgTypeVO typeVO = SgTypeVO.builder().typeName(gxList.get(0).getTypeName()).build(); 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); }
