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

shenyijian

2024-10-31 0daf60dc7bd51091b64639e656686c611926a86f

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml

@@ -132,8 +132,8 @@
        re.id AS reportId,
        pro.lon_lat,
        re.resubmit,
        d.price,
        Pdict.sort
        COALESCE(d.price, 99) as price,
        COALESCE(Pdict.sort, 0)  as sort
        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

@@ -217,7 +217,7 @@
                    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();