From 45899d6fc5850ad00790d8158f27c2a886b74fe2 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Tue, 18 Nov 2025 16:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E7=82=AC=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ShouJuStatisticsService.java      | 136 ++++++------------
 .../mapper/ShouJuStatisticsMapper.xml         |   9 +-
 2 files changed, 46 insertions(+), 99 deletions(-)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java
index 7a1965b..1395b43 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java
@@ -33,102 +33,46 @@ public class ShouJuStatisticsService implements StatisticsService {
     private final String[] weeks_ = {"周日", "周一", "周二", "周三", "周四", "周五", "周六"};
     private final String[] months = {"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"};
     private final String group = "[\n" +
-            "  {\n" +
-            "    \"C1\": \"256\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"257\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"263\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"275\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"289\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"292\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"310\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"316\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"317\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"319\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"323\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"324\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"325\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"327\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"330\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"331\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"334\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"335\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"337\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"338\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"339\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"340\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"341\",\n" +
-            "    \"C2\": \"装修垃圾\"\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"C1\": \"346\",\n" +
-            "    \"C2\": \"拆除垃圾\"\n" +
-            "  }\n" +
+            "  {\"C1\":\"257\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"275\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"327\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"330\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"338\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"339\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"346\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"349\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"289\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"292\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"3\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"310\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"316\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"317\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"319\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"323\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"324\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"325\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"331\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"334\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"335\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"337\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"340\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"341\",\"C2\":\"装修垃圾\"}\n" +
+
+            "  {\"C1\":\"328\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"332\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"342\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"343\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"350\",\"C2\":\"拆除垃圾\"},\n" +
+            "  {\"C1\":\"288\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"291\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"318\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"320\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"321\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"322\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"329\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"333\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"344\",\"C2\":\"装修垃圾\"},\n" +
+            "  {\"C1\":\"345\",\"C2\":\"装修垃圾\"},\n" +
             "]";
 
     @Override
diff --git a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml
index 2117f19..518f15c 100644
--- a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml
@@ -126,13 +126,16 @@
         ORDER BY a.create_time DESC
         LIMIT 10
     </select>
+
     <select id="disposeWeight" resultType="java.lang.Double">
         SELECT IFNULL(SUM(a.weight), 0) weight
         FROM ba_order a
-                 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 <![CDATA[ <= ]]> #{endTime}
+                 INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 1 AND b.category_id IN (51, 47) AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2)
+        WHERE a.create_time >= #{startTime}
+          AND a.create_time <![CDATA[ <= ]]> #{endTime}
           AND a.type != 4
+          AND a.finish = 1
+          AND a.status = 1
     </select>
     <select id="getTodayOrderSummary" resultType="com.njzscloud.supervisory.statistics.pojo.TodayOrderSummary">
         SELECT MAX(IF(order_status = '已完成', order_count, 0)) completed,