From 21dfddd6e09d32a50a636fff62a3d8a2ed362d5a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 20 八月 2026 16:29:49 +0800
Subject: [PATCH] feat：合同标的物新增导入 银行流水强制确认 简易合同新增 发票重开 合同标的物导入
---
platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml | 111 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 35 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..57c4e28 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 >= CURDATE() -->
AND cob.out_bound_time < 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 >= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
AND cob.out_bound_time < 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 >= DATE_FORMAT( CURDATE(), '%Y-01-01' )
AND cob.out_bound_time < 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 >= CURDATE() -->
AND cob.out_bound_time < 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 >= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
AND cob.out_bound_time < 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 >= DATE_FORMAT( CURDATE(), '%Y-01-01' )
AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hbbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xbbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) dbbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hdbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) znbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xnbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hwbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hbbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xbbr,
- (
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) dbbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hdbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) znbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) xnbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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 >= CURDATE() -->
- AND cob.out_bound_time < DATE_ADD( CURDATE(), INTERVAL -6 DAY )) hwbr,
+ AND cob.out_bound_time >= CURDATE()
+ AND cob.out_bound_time < 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'
--
Gitblit v1.9.1