From 6d2ff8a9f9242d547573872756a7aef2488105b9 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 9 Nov 2023 09:16:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E8=97=95=E5=B1=B1=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
index ea88667..c4e7d00 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
@@ -2220,7 +2220,7 @@ public class OrderStatService {
         Record rec = new Record().set("id", 99).set("name", "石畈处置砂").set("isdeploy", 1).set("del", 0);
         List<Record> sups = Db.find("select t.*, s.yield from supermarket t \n" +
                 " left join supermarket_yield s on s.supermarket_id = t.id and s.year = ? \n" +
-                " where id <= 6 or id = 11 ", year);
+                " where id <= 6 or id = 11 or id = 12 ", year);
         if (sups.size() > 0) {
             sups.add(rec);
         }
@@ -2858,7 +2858,7 @@ public class OrderStatService {
                 "	supermarket t\n" +
                 "WHERE\n" +
                 "	id <= 6\n" +
-                "OR id = 11");
+                "OR id = 11 or id = 12 ");
 
        // 预售金额统计
         List<Object> paraList1 = new ArrayList<>();
@@ -3157,7 +3157,7 @@ public class OrderStatService {
                 "	supermarket t\n" +
                 "WHERE\n" +
                 "	id <= 6\n" +
-                "OR id = 11");
+                "OR id = 11 or id = 12 ");
 
         List<Object> shParamsList = new ArrayList<>();
         List<Object> yhParamsList = new ArrayList<>();