From 7b696a79ff2dde951bda2a4b9108f786c6f513f0 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 16 Jul 2025 16:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E6=AE=B5=E7=BB=9F=E8=AE=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A5=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cowr/ssjygl/stat/sale/OrderStatService.java   | 15 ++++++++++-----
 .../cowr/ssjygl/transport/TransportService.java   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
index dc47cd7..54f0c00 100644
--- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
@@ -89,8 +89,13 @@ public class OrderStatService {
         }
 
         if (supermarket_id != null && supermarket_id > 0) {
-            temp_sql += " and t.supermarket_id = ? \n";
-            paraTempList.add(supermarket_id);
+            if(supermarket_id == 4){
+                temp_sql += " and t.supermarket_id in (4,5) \n";
+            } else{
+                temp_sql += " and t.supermarket_id = ? \n";
+                paraTempList.add(supermarket_id);
+            }
+
         }
 
         if (trans_co_id != null && trans_co_id > 0) {
@@ -142,7 +147,7 @@ public class OrderStatService {
                 "    , a.trans_price\n" +
                 "    , a.trans_distance\n" +
                 "    , a.supermarket_id\n" +
-                "    , s.name supermarket_name\n" +
+                "    , case when a.supermarket_id = 4 then '巴河' else s.name end as supermarket_name\n" +
                 "    , a.type\n" +
                 "    , a.trans_co_id\n" +
                 "    , a.trans_co_name\n" +
@@ -1960,7 +1965,7 @@ public class OrderStatService {
                     " and t.create_time <= ? \n" +
                     paramsSql +
                     " group by case when t.supermarket_id in (4,5) then 4 else t.supermarket_id end,t.product_id,t.product_name\n" +
-                    ") a on s.id = a.id where s.type = 0 order by s.id", paramsArray.toArray());
+                    ") a on s.id = a.id where s.type = 0 and s.id != 5 order by s.id", paramsArray.toArray());
         } else {
             list = Db.find("select s.id, s.name, a.cnt, a.total_price, a.total_weight from supermarket s\n" +
                     "left join (\n" +
@@ -1971,7 +1976,7 @@ public class OrderStatService {
                     " and t.create_time >= ? \n" +
                     " and t.create_time <= ? \n" +
                     " group by case when t.supermarket_id in (4,5) then 4 else t.supermarket_id end\n" +
-                    ") a on s.id = a.id where s.type = 0 order by s.id", paramsArray.toArray());
+                    ") a on s.id = a.id where s.type = 0 and s.id != 5 order by s.id", paramsArray.toArray());
         }
 
         Record hj = new Record();
diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java
index 83b606f..dff8c02 100644
--- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java
@@ -55,7 +55,7 @@ public class TransportService extends BaseService {
      * @return
      */
     public Page<Record> find(PageParam pp, String order_sn, String stm, String etm, String truck_license, Integer supermarket_id, Integer trans_co_id, Integer state, Integer supermarket_type) {
-        String selectsql = "select t.*, case when t.supermarket_id = 4 then '巴河' else s.name end as supermarket_name ";
+        String selectsql = "select t.*, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name ";
         String fromsql = "from transport t \n" +
                 " left join supermarket s on s.id = t.supermarket_id \n" +
                 " where 1=1 "; // 只显示未删除的