大屏

njzscloud-svr/src/main/resources/mapper/bs/StatisticsMapper.xml

@@ -191,13 +191,13 @@
     </select>
     <select id="baseInfo" resultType="java.util.Map">
         SELECT biz_obj  bizObj,
-               case biz_obj
-                   when 'WuYe' then '物业'
-                   when 'SheQu' then '社区'
-                   when 'QiYe' then '企业'
-                   when 'GeTi' then '个体户'
-                   else ''
-                   end  bizObjTxt,
+               CASE biz_obj
+                   WHEN 'WuYe' THEN '物业'
+                   WHEN 'SheQu' THEN '社区'
+                   WHEN 'QiYe' THEN '企业'
+                   WHEN 'GeTi' THEN '个体户'
+                   ELSE ''
+                   END bizObjTxt,
                COUNT(*) `count`
         FROM sys_user
         WHERE biz_obj IN (
@@ -208,16 +208,24 @@
             )
           AND deleted = 0
         GROUP BY biz_obj
+        UNION ALL
+        SELECT 'XiaoNa' bizObj,
+               '消纳场' bizObjTxt,
+               COUNT(*) `bizObjTxt`
+        FROM biz_company
+        WHERE station = 1
+          AND deleted = 0
+          AND station_name NOT LIKE '%测试%'
     </select>
     <select id="disposeInfo" resultType="java.util.Map">
-        SELECT c.category_name categoryName, ROUND(IFNULL(SUM(d.settle_weight), 0) / 1000, 2) weight
+        SELECT b.goods_name goodsName, ROUND(IFNULL(SUM(d.settle_weight), 0) / 1000, 2) weight
         FROM order_info a
                  INNER JOIN order_goods b ON b.id = a.goods_id
                  INNER JOIN goods_category c ON c.id = b.goods_category_id AND c.deleted = 0
                  INNER JOIN order_car_in_out d ON d.id = a.car_in_out_id
         WHERE a.order_status = 'YiWanCheng'
           AND a.deleted = 0
-        GROUP BY c.category_name
+        GROUP BY b.goods_name
     </select>
     <select id="garbageInfo" resultType="java.util.Map">
         SELECT area_name areaName, weight