From 145580fd820bb31334f2e71643413e846b7ce904 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 30 十月 2026 15:53:20 +0800
Subject: [PATCH] feat:统计内容1-8页

---
 platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml |  153 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
index 113390f..0111ff9 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
@@ -74,7 +74,7 @@
 		cob.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
 		AND cob.subject_matter_code = csm.material_code
-		AND cob.comp_id = 2056555602756063234
+		AND cob.comp_id = 2089995177814495234
 		 <!--  AND cob.out_bound_time &gt;= CURDATE() -->
 		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) smjbr,
 		(
@@ -87,7 +87,7 @@
 		cob.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
 		AND cob.subject_matter_code = csm.material_code
-		AND cob.comp_id = 2056555602756063234
+		AND cob.comp_id = 2089995177814495234
 		AND cob.out_bound_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
 		AND cob.out_bound_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
 		(
@@ -100,7 +100,7 @@
 		cob.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
 		AND cob.subject_matter_code = csm.material_code
-		AND cob.comp_id = 2056555602756063234
+		AND cob.comp_id = 2089995177814495234
 		AND cob.out_bound_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
 		AND cob.out_bound_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
 		(
@@ -277,7 +277,7 @@
 		AND csm.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
 		AND cob.subject_matter_code = csm.material_code
-		AND cob.comp_id = 2056555602756063234
+		AND cob.comp_id = 2089995177814495234
 		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
 		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) smjbr,
 		(
@@ -291,7 +291,7 @@
 		AND csm.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
 		AND cob.subject_matter_code = csm.material_code
-		AND cob.comp_id = 2056555602756063234
+		AND cob.comp_id = 2089995177814495234
 		AND cob.out_bound_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
 		AND cob.out_bound_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
 		(
@@ -305,7 +305,7 @@
 		AND csm.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
 		AND cob.subject_matter_code = csm.material_code
-		AND cob.comp_id = 2056555602756063234
+		AND cob.comp_id = 2089995177814495234
 		AND cob.out_bound_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
 		AND cob.out_bound_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
 		(
@@ -450,12 +450,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND bc.area_id = '2'
 		AND cob.subject_matter_code = csm.material_code
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hbbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) hbbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -469,6 +470,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND bc.area_id = '2'
 		AND cob.subject_matter_code = csm.material_code
@@ -488,6 +490,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND bc.area_id = '2'
 		AND cob.subject_matter_code = csm.material_code
@@ -507,12 +510,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '6'
 		  AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xbbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) xbbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -526,6 +530,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '6'
@@ -545,6 +550,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '6'
@@ -564,12 +570,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '1'
 		  AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) dbbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) dbbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -583,6 +590,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '1'
@@ -602,6 +610,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '1'
@@ -621,12 +630,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '3'
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hdbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) hdbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -640,6 +650,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '3'
@@ -659,6 +670,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '3'
@@ -678,12 +690,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '4'
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) znbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) znbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -697,6 +710,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '4'
@@ -716,6 +730,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '4'
@@ -735,12 +750,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '5'
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xnbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) xnbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -754,6 +770,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '5'
@@ -773,6 +790,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '5'
@@ -792,12 +810,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.export_service_attr = '2'
 		  AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hwbr,
+		  AND cob.out_bound_time &gt;= CURDATE()
+		  AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) hwbr,
 		(
 		SELECT
 		sum( csm.unit_price * cob.out_bound_num )
@@ -811,6 +830,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.export_service_attr = '2'
@@ -830,6 +850,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.export_service_attr = '2'
@@ -852,12 +873,13 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND bc.area_id = '2'
 				  AND cob.subject_matter_code = csm.material_code
 				  AND cob.comp_id = #{compId}
-				  <!--  AND cob.out_bound_time &gt;= CURDATE() -->
-				  AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hbbr,
+				AND cob.out_bound_time &gt;= CURDATE()
+				AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) hbbr,
 			(
 				SELECT
 					sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
@@ -871,6 +893,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND bc.area_id = '2'
 				  AND cob.subject_matter_code = csm.material_code
@@ -890,6 +913,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND bc.area_id = '2'
 				  AND cob.subject_matter_code = csm.material_code
@@ -909,13 +933,14 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.area_id = '6'
 				  AND cob.comp_id = #{compId}
-				  <!--  AND cob.out_bound_time &gt;= CURDATE() -->
-				  AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xbbr,
-			(
+				AND cob.out_bound_time &gt;= CURDATE()
+				AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) xbbr,
+				(
 				SELECT
 					sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
 				FROM
@@ -928,6 +953,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.area_id = '6'
@@ -947,6 +973,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.area_id = '6'
@@ -966,12 +993,13 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.area_id = '1'
 				  AND cob.comp_id = #{compId}
-				  <!--  AND cob.out_bound_time &gt;= CURDATE() -->
-				  AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) dbbr,
+				AND cob.out_bound_time &gt;= CURDATE()
+				AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) dbbr,
 			(
 				SELECT
 					sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
@@ -985,6 +1013,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+		          AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.area_id = '1'
@@ -1004,6 +1033,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.area_id = '1'
@@ -1023,12 +1053,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '3'
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hdbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) hdbr,
 		(
 		SELECT
 		sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
@@ -1042,6 +1073,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '3'
@@ -1061,6 +1093,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '3'
@@ -1080,12 +1113,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '4'
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) znbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) znbr,
 		(
 		SELECT
 		sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
@@ -1099,6 +1133,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '4'
@@ -1118,6 +1153,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '4'
@@ -1137,12 +1173,13 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '5'
 		AND cob.comp_id = #{compId}
-		<!--  AND cob.out_bound_time &gt;= CURDATE() -->
-		AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xnbr,
+		AND cob.out_bound_time &gt;= CURDATE()
+		AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) xnbr,
 		(
 		SELECT
 		sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
@@ -1156,6 +1193,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '5'
@@ -1175,6 +1213,7 @@
 		AND bc.del_flag = '0'
 		AND c.del_flag = '0'
 		AND cob.contract_id = csm.contract_id
+		AND cob.contract_id = c.id
 		AND bc.id = c.party_a_id
 		AND cob.subject_matter_code = csm.material_code
 		AND bc.area_id = '5'
@@ -1194,12 +1233,13 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+					AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.export_service_attr = '2'
 				  AND cob.comp_id = #{compId}
-				  <!--  AND cob.out_bound_time &gt;= CURDATE() -->
-				  AND cob.out_bound_time &lt; DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hwbr,
+				  AND cob.out_bound_time &gt;= CURDATE()
+				  AND cob.out_bound_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) hwbr,
 			(
 				SELECT
 					sum( csm.unit_price * ( cob.out_bound_num - cob.invoice_num ) )
@@ -1232,6 +1272,7 @@
 				  AND bc.del_flag = '0'
 				  AND c.del_flag = '0'
 				  AND cob.contract_id = csm.contract_id
+				  AND cob.contract_id = c.id
 				  AND bc.id = c.party_a_id
 				  AND cob.subject_matter_code = csm.material_code
 				  AND bc.export_service_attr = '2'
@@ -1266,7 +1307,8 @@
 		t.comp_id,
 		t1.contract_no,
 		t2.company_name AS busGuestName,
-		t3.unit_price
+		t3.unit_price,
+		t4.batch_number
 		FROM
 		contract_out_bound t
 		LEFT JOIN contract t1 ON ( t1.id = t.contract_id AND t1.del_flag = '0' )
@@ -1274,6 +1316,7 @@
 		LEFT JOIN contract_subject_matter t3 ON t3.contract_id = t.contract_id
 		AND t3.material_code = t.subject_matter_code
 		AND t3.del_flag = '0'
+		LEFT JOIN out_bound t4 ON t4.id = t.out_bound_id
 		WHERE
 		t.del_flag = '0'
 		<if test="queryDTO.queryCompId !=null and queryDTO.queryCompId !=''">
@@ -1281,6 +1324,9 @@
 		</if>
 		<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
 			AND t1.contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
+		</if>
+		<if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
+			AND t1.contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
 		</if>
 		<if test="queryDTO.busGuestName !=null and queryDTO.busGuestName !=''">
 			AND t2.company_name LIKE CONCAT('%', #{queryDTO.busGuestName}, '%')
@@ -1393,4 +1439,39 @@
 		ORDER BY
 		t.create_time DESC
 	</select>
+    <select id="gcpbkwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			d.dict_name AS bkmc,
+			IFNULL(sum(c.unit_price*c.advance_num+c.unit_price*c.out_bound_num),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_out_bound c
+			ON
+				d.dict_code = c.product_section  and c.del_flag = '0'
+					and c.out_bound_time &gt;= #{start}
+					and c.out_bound_time &lt;= #{end}
+		WHERE
+			d.dict_key = 'zb-cpbk'
+		GROUP BY
+			d.dict_name, d.dict_key;
+	</select>
+    <select id="cpxssrwcqk" resultType="com.by4cloud.platformx.business.vo.CpxssrwcqkItemVo">
+		SELECT
+			d.dict_name AS xm,
+			IFNULL( sum( c.advance_num+ c.out_bound_num), 0 ) AS xsl,
+			IFNULL(sum(c.unit_price*c.advance_num+c.unit_price*c.out_bound_num),0) AS xssr
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_out_bound c
+			ON
+						d.dict_code = c.product_section  and c.del_flag = '0'
+					and c.out_bound_time &gt;= #{monstart}
+					and c.out_bound_time &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-cpbk'
+		GROUP BY
+			d.dict_name, d.dict_key;
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1