From eb52d8cb614dd1fd2bd2e1c736eb5130819d70dc Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Mon, 4 Sep 2023 16:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messageCenter/MessageCenterMapper.xml     | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
index d38c8be1..306d3ce1 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
@@ -859,7 +859,7 @@ SELECT
 FROM
 	jg_purchaseorder a
 	LEFT JOIN jg_purchaseorder_item0 b ON a.id = b.purchaseorder_id
-	AND b.delete_mark = '0'
+
 	LEFT JOIN (
 	SELECT
 		SUM( amount ) - SUM( pay_price ) AS notPaypalAmounts,
@@ -878,7 +878,7 @@ FROM
 WHERE
 	to_days( a.creator_time ) = to_days(
 	now())
-	AND a.delete_mark = '0'
+	AND a.delete_mark = '0' AND b.delete_mark = '0'
 GROUP BY
 	a.department_id
     </select>
@@ -901,40 +901,40 @@ GROUP BY
     </resultMap>
     <select id="getSalesorderData" resultMap="getSalesorderDataMap">
 
-SET @i = 0;
-SELECT
-	( @i := @i + 1 ) AS 'Number',
-	F_FullName AS FFullName,
-	SUM( a.price ) AS amout,
-	bangdan,
-	settlement,
-	SUM( a.price )- SUM( amount_collected ) AS notCollectionAmounts,
-	SUM( amount_collected ) AS collectionamounts
-FROM
-	jg_salesorder a
-	LEFT JOIN base_organize z ON a.department_id = z.F_Id
-	LEFT JOIN (
-	SELECT
-		COUNT( b.id ) AS bangdan,
-		Round( SUM(IF ( b.unit = '1', b.settlement / 1000, b.settlement )), 3 ) AS settlement,
-		a.department_id
-	FROM
-		jg_salesorder a
-		LEFT JOIN jg_salesorder_item0 b ON a.id = b.sales_order_id
-		AND b.delete_mark = '0'
-	WHERE
-		to_days( a.creator_time ) = to_days(
-		now())
-		AND a.delete_mark = '0'
-	GROUP BY
-		a.department_id
-	) c ON a.department_id = c.department_id
-WHERE
-	to_days( a.creator_time ) = to_days(
-	now())
-	AND a.delete_mark = '0'
-GROUP BY
-	a.department_id
+        SET @i = 0;
+        SELECT
+            ( @i := @i + 1 ) AS 'Number',
+                F_FullName AS FFullName,
+            SUM( a.price ) AS amout,
+            bangdan,
+            settlement,
+            SUM( a.price )- SUM( amount_collected ) AS notCollectionAmounts,
+            SUM( amount_collected ) AS collectionamounts
+        FROM
+            jg_salesorder a
+                LEFT JOIN base_organize z ON a.department_id = z.F_Id
+                LEFT JOIN (
+                SELECT
+                    COUNT( b.id ) AS bangdan,
+                    Round( SUM(IF ( b.unit = '1', b.settlement / 1000, b.settlement )), 3 ) AS settlement,
+                    a.department_id
+                FROM
+                    jg_salesorder a
+                        LEFT JOIN jg_salesorder_item0 b ON a.id = b.sales_order_id
+
+                WHERE
+                        to_days( a.creator_time ) = to_days(
+                            now())
+                  AND a.delete_mark = '0' 	AND b.delete_mark = '0'
+                GROUP BY
+                    a.department_id
+            ) c ON a.department_id = c.department_id
+        WHERE
+                to_days( a.creator_time ) = to_days(
+                    now())
+          AND a.delete_mark = '0'
+        GROUP BY
+            a.department_id
     </select>