Merge branch 'dev' of http://101.36.160.140:21044/province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/entity/VO/DeportStockChart.java

@@ -40,4 +40,7 @@ public class DeportStockChart {
     @ApiModelProperty(value = "性质", position = 7)
     private String hwxz ;
 
+    @ApiModelProperty(value = "性质名称", position = 8)
+    private String hwxzName ;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/mapper/mapping/GrainOilReserveMapper.xml

@@ -190,10 +190,12 @@ ORDER  by pz
                 a.longitude,
                 a.latitude,
                 ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,2) as kcsl,
-                GROUP_CONCAT(DISTINCT b.hwxz) as hwxz
+                GROUP_CONCAT(DISTINCT b.hwxz) as hwxz,
+                GROUP_CONCAT(DISTINCT c.enumname) as hwxzName
                 FROM
                 depot_qh.org_info a
                 LEFT JOIN depot_qh.data_kcgl_kcsw_default b on a.org_id = b.UnitID and b.hwxz in (6877,6878,6879)
+                LEFT JOIN depot_qh.basic_enum c on b.hwxz = c.enumId
                 /*  只要省储，市储，县储*/
                 where a.org_id != '9'
                 GROUP BY a.org_id