diff --git a/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml index 8874723..e939e3a 100644 --- a/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml @@ -14,6 +14,7 @@ INNER JOIN ba_goods b ON b.id = a.goods_id AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.station_id = 1 AND a.status IN (0, 1, 2, 3) + AND a.type != 4 ORDER BY a.create_time DESC LIMIT 5) t1 UNION ALL @@ -25,6 +26,7 @@ FROM ba_order a INNER JOIN ba_goods b ON b.id = a.goods_id AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.station_id = 2 + AND a.type != 4 AND a.status IN (0, 1, 2, 3) ORDER BY a.create_time DESC LIMIT 5) t2) a @@ -34,7 +36,7 @@ SELECT MAX(IF(group_id = 1, c, 0)) san_hu, MAX(IF(group_id = 2, c, 0)) qing_yun, MAX(IF(group_id = 7, c, 0)) wu_ye - FROM (SELECT group_id, COUNT(*) c + FROM (SELECT group_id, FLOOR(COUNT(*) / 2) c FROM ba_user WHERE group_id IN (1, 2, 7) GROUP BY group_id) t @@ -51,6 +53,7 @@ AND b.name NOT LIKE '%拆除垃圾(派车清运零星客户专用)%' AND b.name NOT LIKE '%拆除垃圾(活动优惠)%' AND b.name NOT LIKE '%矿石%' + AND a.type != 4 GROUP BY b.name) t ORDER BY weight DESC LIMIT 3) t1 @@ -64,6 +67,7 @@ WHERE b.name NOT LIKE '%青石%' AND b.name NOT LIKE '%矿石%' AND b.name NOT LIKE '%一期项目%' + AND a.type != 4 GROUP BY b.name) t ORDER BY weight DESC LIMIT 3) t2 @@ -73,11 +77,12 @@ resultType="com.njzscloud.supervisory.statistics.pojo.GarbageDisposeSummary"> SELECT goods_name garbage_name, weight FROM (SELECT a.goods_name, SUM(a.weight) weight - FROM ba_order a - INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 2 AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) - WHERE out_time >= UNIX_TIMESTAMP(DATE_FORMAT(CURDATE(), '%Y-%m-01 00:00:00')) - AND out_time UNIX_TIMESTAMP(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-%m-01'), INTERVAL 1 MONTH)) - GROUP BY a.goods_name) t + FROM ba_order a + INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 2 AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) + WHERE a.out_time >= UNIX_TIMESTAMP(DATE_FORMAT(CURDATE(), '%Y-%m-01 00:00:00')) + AND a.type != 4 + AND a.out_time UNIX_TIMESTAMP(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-%m-01'), INTERVAL 1 MONTH)) + GROUP BY a.goods_name) t ORDER BY weight DESC LIMIT 6 @@ -91,6 +96,7 @@ INNER JOIN ba_user b ON b.id = a.vip_user AND b.group_id = 2 INNER JOIN ba_goods c ON c.id = a.goods_id AND c.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.status IN (0, 1, 2, 3) + AND a.type != 4 GROUP BY b.id, IF(a.status = 1, 1, 0)) t1 INNER JOIN ba_user t2 ON t2.id = t1.id ORDER BY c DESC @@ -105,6 +111,7 @@ INNER JOIN ba_user b ON b.id IN (230, 343, 435) INNER JOIN ba_goods c ON c.id = a.goods_id AND c.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.status IN (0, 1, 2, 3) + AND a.type != 4 GROUP BY b.id, IF(a.status = 1, 1, 0)) t1 INNER JOIN ba_user t2 ON t2.id = t1.id ORDER BY c DESC)tt2 @@ -119,6 +126,7 @@ FROM ba_order a INNER JOIN ba_goods b ON b.id = a.goods_id AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.vip_user = #{userId} + AND a.type != 4 ORDER BY a.create_time DESC LIMIT 10 @@ -128,6 +136,7 @@ INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 1 AND b.id NOT IN (287,286,279,278,293,273,271,270,262,2) WHERE a.out_time >= #{startTime} AND a.out_time #{endTime} + AND a.type != 4 @@ -150,5 +160,6 @@ WHERE a.status = 1 AND a.out_time >= #{startTime} AND a.out_time #{endTime} + AND a.type != 4