From 683538daddebfd462860ae5c52e731f6e0a85f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 1 Mar 2023 23:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper_xml/DepotHeadMapperEx.xml          | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index d88bee15..eb567b53 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -860,62 +860,66 @@
 
     <select id="getBuyAndSaleBasicStatistics" resultType="java.math.BigDecimal">
         SELECT
-        ifnull(sum(discount_last_money),0)
-        FROM jsh_depot_head
+        ifnull(sum(dh.discount_last_money),0)
+        FROM jsh_depot_head dh left join jsh_depot_item di on dh.id = di.header_id
         WHERE 1=1
+        and di.id is not null
         <if test="type != null">
-            and type=#{type}
+            and dh.type=#{type}
         </if>
         <if test="subType != null">
-            and sub_type=#{subType}
+            and dh.sub_type=#{subType}
         </if>
         <if test="hasSupplier == 1">
-            and organ_id is not null
+            and dh.organ_id is not null
         </if>
         <if test="hasSupplier == 0">
-            and organ_id is null
+            and dh.organ_id is null
         </if>
         <if test="beginTime != null">
-            and oper_time >= #{beginTime}
+            and dh.oper_time >= #{beginTime}
         </if>
         <if test="endTime != null">
-            and oper_time &lt;= #{endTime}
+            and dh.oper_time &lt;= #{endTime}
         </if>
         <if test="creatorArray != null">
-            and creator in (
+            and dh.creator in (
             <foreach collection="creatorArray" item="creator" separator=",">
                 #{creator}
             </foreach>
             )
         </if>
-        and ifnull(delete_flag,'0') !='1'
+        and ifnull(dh.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag,'0') !='1'
     </select>
 
     <select id="getBuyAndSaleRetailStatistics" resultType="java.math.BigDecimal">
         SELECT
-        ifnull(sum(total_price),0)
-        FROM jsh_depot_head
+        ifnull(sum(dh.total_price),0)
+        FROM jsh_depot_head dh left join jsh_depot_item di on dh.id = di.header_id
         WHERE 1=1
+        and di.id is not null
         <if test="type != null">
-            and type=#{type}
+            and dh.type=#{type}
         </if>
         <if test="subType != null">
-            and sub_type=#{subType}
+            and dh.sub_type=#{subType}
         </if>
         <if test="beginTime != null">
-            and oper_time >= #{beginTime}
+            and dh.oper_time >= #{beginTime}
         </if>
         <if test="endTime != null">
-            and oper_time &lt;= #{endTime}
+            and dh.oper_time &lt;= #{endTime}
         </if>
         <if test="creatorArray != null">
-            and creator in (
+            and dh.creator in (
             <foreach collection="creatorArray" item="creator" separator=",">
                 #{creator}
             </foreach>
             )
         </if>
-        and ifnull(delete_flag,'0') !='1'
+        and ifnull(dh.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag,'0') !='1'
     </select>
 
     <select id="debtList" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">