修改金额

SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml

@@ -850,6 +850,7 @@
         <result property="paypalamounts" column="paypalamounts"/>
     </resultMap>
     <select id="getPurchaseorderData" resultMap="getPurchaseorderDataMap">
+
 SET @i = 0;
 SELECT
 	( @i := @i + 1 ) AS Number,
@@ -861,53 +862,27 @@ SELECT
 	) settlement,
 	IFNULL(
 		ROUND(
-			SUM( purchase_price ) / COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
+		SUM( purchase_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
 			2
 		),
 		0
 	) amout,
-	notPaypalAmounts,
--- 	SUM( paypal_amounts ) paypalamountsss,
-ROUND(paypalamounts,2) AS paypalamounts
+		IF(is_pay='0',ROUND(
+		SUM( purchase_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
+		2
+	),0) AS notPaypalAmounts,
+	IF(is_pay='1',ROUND(
+		SUM( purchase_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
+		2
+	),0) AS paypalamounts
 FROM
 	jg_poundlist a
 	LEFT JOIN base_organize z ON a.department_id = z.F_Id
-	LEFT JOIN (
-	SELECT
-	IF
-		(
-			is_pay = 1,
-			0,
-			ROUND(
-				SUM( purchase_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END ),
-			2
-			)
-		) AS notPaypalAmounts,
-			IF
-		(
-			is_pay = 0,
-			0,
-			ROUND(
-				SUM( purchase_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END ),
-				6
-			)
-		) AS paypalamounts,
-		department_id AS cid
-	FROM
-		jg_poundlist
-	WHERE
-		to_days( pound_date ) = to_days(
-		now())
-		AND
-		delete_mark='0'
-	GROUP BY
-		cid
-	) c ON c.cid = a.department_id
+
 WHERE
 	to_days( a.pound_date ) = to_days(
 	now())
-	AND
-		delete_mark='0'
+	AND delete_mark = '0'
 GROUP BY
 	a.department_id
     </select>
@@ -926,59 +901,31 @@ GROUP BY
         <result property="collectionamounts" column="collectionamounts"/>
     </resultMap>
     <select id="getSalesorderData" resultMap="getSalesorderDataMap">
+
 SET @i = 0;
 SELECT
 	( @i := @i + 1 ) AS 'Number',
-	F_FullName AS FFullName,
--- 	SUM( sales_price ) / COUNT( id ) AS asda,
-	IFNULL(
-		ROUND(
-			SUM( sales_price ) / COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
+	F_FullName AS FFullName,-- 	SUM( sales_price ) / COUNT( id ) AS asda,
+	ROUND(
+		SUM( sales_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
 		2
-		),
-		0
-	) amout,
-notCollectionAmounts,
- collectionamounts
+	) amout ,
+		IF(is_collection='0',ROUND(
+		SUM( sales_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
+		2
+	),0) AS notCollectionAmounts,
+	IF(is_collection='1',ROUND(
+		SUM( sales_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
+		2
+	),0) AS collectionamounts
 FROM
 	jg_poundlist a
 	LEFT JOIN base_organize z ON a.department_id = z.F_Id
-	LEFT JOIN (
-	SELECT
-	IF
-		(
-			is_collection = 1,
-			0,
-			ROUND(
-				SUM( sales_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END )-paypal_amounts,
-				2
-			)
-		) AS notCollectionAmounts,
-			IF
-		(
-			is_collection = 0,
-			0,
-			ROUND(
-				SUM( sales_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END )-paypal_amounts,
-				2
-			)
-		) AS collectionamounts,
-		department_id AS cid
-	FROM
-		jg_poundlist
-	WHERE
-		to_days( pound_date ) = to_days(
-		now())
-		AND
-		delete_mark='0'
-	GROUP BY
-		cid
-	) c ON c.cid = a.department_id
 WHERE
 	to_days( a.pound_date ) = to_days(
 	now())
-			AND
-		delete_mark='0'
+	AND
+	a.delete_mark='0'
 GROUP BY
 	a.department_id
     </select>