地图展示-SQL修改

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kshzs/KshzsServiceImpl.java

@@ -201,6 +201,7 @@ public class KshzsServiceImpl implements KshzsService{
     public PageResult<crkVo> selectCrkList(pageParamVo paramVo) {
         // 获取数据字典
         List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getDictType, "system_lsdj");
+        List<DictDataDO> pzlist = dictDataMapper.selectList(DictDataDO::getDictType, "system_lspz");
         CrkxxPageReqVO reqVO = new CrkxxPageReqVO();
         reqVO.setPageNo(paramVo.getPageNo());
         reqVO.setPageSize(paramVo.getPageSize());
@@ -216,6 +217,13 @@ public class KshzsServiceImpl implements KshzsService{
                     }
                 }
             }
+            if (crkxxDO.getLspzmc() != null){
+                for (DictDataDO dictDataDO : pzlist) {
+                    if (crkxxDO.getLspzmc().equals(dictDataDO.getValue())){
+                        crkxxDO.setLspzmc(dictDataDO.getLabel());
+                    }
+                }
+            }
         }
         return BeanUtils.toBean(crkxxDOPageResult, crkVo.class);
     }

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -168,7 +168,7 @@
                 WHEN hw.lsdjbm = '04' THEN '四等'
                 WHEN hw.lsdjbm = '05' THEN '五等'
                 ELSE '等外'
-                END AS lsdjmc,lqjc.CWW cfww,lqjc.CWS cfws,lqjc.CNW cfnw,lqjc.CNS cfns,lqjc.LSZGW lszgw,lqjc.LSZDW lszdw,lqjc.LSPJW lspjw,lqjc.FILE_IDS fileIds
+                END AS lsdjmc,round(lqjc.CWW,0) cfww,round(lqjc.CWS,0) cfws,round(lqjc.CNW,0) cfnw,round(lqjc.CNS,0) cfns,round(lqjc.LSZGW,0) lszgw,round(lqjc.LSZDW,0) lszdw,round(lqjc.LSPJW,0) lspjw,lqjc.FILE_IDS fileIds
         from DELIVERY_LQJCXX lqjc
             left join DELIVERY_HWK hw on lqjc.hwk_id = hw.id
         <where>