可视化

Signed-off-by: tangsong <86121657@qq.com>

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

@@ -37,6 +37,7 @@ public class DeportStockChart {
     @ApiModelProperty(value = "库存数量(数字，单位万吨）", position = 6)
     private Double kcsl;
 
-
+    @ApiModelProperty(value = "性质", position = 7)
+    private String hwxz ;
 
 }

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

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