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

@@ -125,13 +125,13 @@ public class KshzsServiceImpl implements KshzsService{
         List<Map<String, Object>> objListMap = kshzsMapper.queryLspzList(paramVo);
         if(objListMap!= null && objListMap.size()>0){
             for (int i = 0; i < objListMap.size(); i++) {
-                if("小麦".equals(objListMap.get(i).get("name").toString())){
+                if("1110000".equals(objListMap.get(i).get("name").toString())){
                     objVo.setXmkc(BigDecimal.valueOf(Double.parseDouble(objListMap.get(i).get("value").toString())));
-                }else if("玉米".equals(objListMap.get(i).get("name").toString())){
+                }else if("1120000".equals(objListMap.get(i).get("name").toString())){
                     objVo.setYmkc(BigDecimal.valueOf(Double.parseDouble(objListMap.get(i).get("value").toString())));
-                }else if("大豆".equals(objListMap.get(i).get("name").toString())){
+                }else if("1130000".equals(objListMap.get(i).get("name").toString())){
                     objVo.setDdkc(BigDecimal.valueOf(Double.parseDouble(objListMap.get(i).get("value").toString())));
-                }else if("稻谷".equals(objListMap.get(i).get("name").toString())){
+                }else if("1411001".equals(objListMap.get(i).get("name").toString())){
                     objVo.setDgkc(BigDecimal.valueOf(Double.parseDouble(objListMap.get(i).get("value").toString())));
                 }
             }
@@ -190,9 +190,16 @@ public class KshzsServiceImpl implements KshzsService{
 
     @Override
     public hwkVo selectHwkInfo(paramVo paramVo) {
+        List<DictDataDO> pzlist = dictDataMapper.selectList(DictDataDO::getDictType, "system_lspz");
         hwkVo hwkVo = kshzsMapper.selectHwkInfo(paramVo);
-        if (hwkVo!= null && hwkVo.getLscd() != null) {
-
+        if (hwkVo!= null) {
+            if (hwkVo.getLspzmc() != null){
+                for (DictDataDO dictDataDO : pzlist) {
+                    if (hwkVo.getLspzmc().equals(dictDataDO.getValue())){
+                        hwkVo.setLspzmc(dictDataDO.getLabel());
+                    }
+                }
+            }
         }
         return hwkVo;
     }
@@ -232,6 +239,7 @@ public class KshzsServiceImpl implements KshzsService{
     public PageResult<zjxxVo> selectZjList(pageParamVo paramVo) {
         // 获取数据字典
         List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getDictType, "system_lsdj");
+        List<DictDataDO> pzlist = dictDataMapper.selectList(DictDataDO::getDictType, "system_lspz");
         ZjxxPageReqVO reqVO = new ZjxxPageReqVO();
         reqVO.setPageNo(paramVo.getPageNo());
         reqVO.setPageSize(paramVo.getPageSize());
@@ -245,13 +253,31 @@ public class KshzsServiceImpl implements KshzsService{
                     }
                 }
             }
+            if (zjxxDO.getLspzmc() != null){
+                for (DictDataDO dictDataDO : pzlist) {
+                    if (zjxxDO.getLspzmc().equals(dictDataDO.getValue())){
+                        zjxxDO.setLspzmc(dictDataDO.getLabel());
+                    }
+                }
+            }
         }
         return BeanUtils.toBean(zjxxDOPageResult, zjxxVo.class);
     }
 
     @Override
     public List<lqjcVo> selectLqjcList(paramVo paramVo) {
-        return kshzsMapper.selectLqjcList(paramVo);
+        List<DictDataDO> pzlist = dictDataMapper.selectList(DictDataDO::getDictType, "system_lspz");
+        List<lqjcVo> dataObj =kshzsMapper.selectLqjcList(paramVo);
+        for (lqjcVo lqjcVo : dataObj){
+            if (lqjcVo.getLspzmc() != null){
+                for (DictDataDO dictDataDO : pzlist) {
+                    if (lqjcVo.getLspzmc().equals(dictDataDO.getValue())){
+                        lqjcVo.setLspzmc(dictDataDO.getLabel());
+                    }
+                }
+            }
+        }
+        return dataObj;
     }
 
     @Override

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

@@ -58,11 +58,13 @@
 
     <select id="selectPieChart" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="map">
         <if test = "lx==1">
-            select round(sum(jjsl/10000),2) "value",lspzmc name from DELIVERY_HWK
+            select round(sum(jjsl/10000),2) "value",label name from DELIVERY_HWK
+            left join SYSTEM_DICT_DATA on lspzbm = value
             <where>
+                dict_type = 'system_lspz'
                 <include refid="queryInfo"/>
             </where>
-            group by lspzmc order by FIELD(lspzmc,'小麦','玉米','稻谷','大豆','其他') asc
+            group by lspzbm order by FIELD(lspzbm,'1110000','1120000','1130000','1411001') asc
         </if>
         <if test = "lx==2">
             select round(sum(jjsl/10000),2) "value",shnd name from DELIVERY_HWK
@@ -83,11 +85,11 @@
     </select>
 
     <select id="queryLspzList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="map">
-        select round(sum(jjsl),2) "value",lspzmc name from DELIVERY_HWK
+        select round(sum(jjsl),2) "value",lspzbm name from DELIVERY_HWK
         <where>
             <include refid="queryInfo"/>
         </where>
-        group by lspzmc order by FIELD(lspzmc,'小麦','玉米','稻谷','大豆','其他') asc
+        group by lspzbm order by FIELD(lspzbm,'1110000','1120000','1130000','1411001') asc
     </select>
 
     <select id="selectCxxList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.cfxxVo">
@@ -143,7 +145,7 @@
     </select>
 
     <select id="selectHwkInfo" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.hwkVo">
-        select hwmc,ca.cfmc,bgyxm bgy,lspzmc,
+        select hwmc,ca.cfmc,bgyxm bgy,lspzbm lspzmc,
                 CASE
                 WHEN lsdjbm = '01' THEN '一等'
                 WHEN lsdjbm = '02' THEN '二等'
@@ -163,7 +165,7 @@
     </select>
 
     <select id="selectLqjcList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.lqjcVo">
-        select hw.hwmc camc,hw.lspzmc,hw.jjsl kcsl,
+        select hw.hwmc camc,hw.lspzbm lspzmc,round(hw.jjsl,0) kcsl,
                 CASE
                 WHEN hw.lsdjbm = '01' THEN '一等'
                 WHEN hw.lsdjbm = '02' THEN '二等'