From f14c50cb0036d3ddd655ce4e34732ba396a836c4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:42:03 +0800
Subject: [PATCH] optimize 统计

---
 java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml
index b61c9b4..c4a7ba6 100644
--- a/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml
@@ -26,9 +26,10 @@
         partyB,c.contract_id,c.contract_id contractId,c.obj_id,c.obj_id objId,c.contract_name,c.contract_name
         contractName,c.start_time,c.start_time startTime,c.end_time,c.end_time
         endTime,c.contract_code,c.contract_code contractCode,c.obj_type,c.obj_type
-        objType,c.operator_link,c.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName,td1.name planTypeName
+        objType,c.operator_link,c.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName,td1.name planTypeName,
+        t.create_time createTime
         from contract_change_plan t
-        inner join contract_change_plan_detail c on t.contract_id = c.contract_id  and c.store_id = t.store_id and c.operate = 'ADD'
+        inner join contract_change_plan_detail c on t.contract_id = c.contract_id and t.plan_id = c.plan_id and c.store_id = t.store_id and c.operate = 'ADD'
         inner JOIN contract_type ct on c.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id = c.store_id
         left JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract_change_plan' and td.table_columns = 'state'
         left JOIN t_dict td1 on td1.status_cd = t.plan_type and td1.table_name = 'contract_change_plan' and td1.table_columns = 'plan_type'
@@ -38,6 +39,15 @@
         </if>
         <if test="contractId !=null and contractId != ''">
             and t.contract_id= #{contractId}
+        </if>
+        <if test="contractName !=null and contractName != ''">
+            and c.contract_name= #{contractName}
+        </if>
+        <if test="contractCode !=null and contractCode != ''">
+            and c.contract_code= #{contractCode}
+        </if>
+        <if test="contractType !=null and contractType != ''">
+            and c.contract_type= #{contractType}
         </if>
         <if test="planId !=null and planId != ''">
             and t.plan_id= #{planId}
@@ -116,6 +126,15 @@
         <if test="contractId !=null and contractId != ''">
             and t.contract_id= #{contractId}
         </if>
+        <if test="contractName !=null and contractName != ''">
+            and c.contract_name= #{contractName}
+        </if>
+        <if test="contractCode !=null and contractCode != ''">
+            and c.contract_code= #{contractCode}
+        </if>
+        <if test="contractType !=null and contractType != ''">
+            and c.contract_type= #{contractType}
+        </if>
         <if test="planId !=null and planId != ''">
             and t.plan_id= #{planId}
         </if>

--
Gitblit v1.8.0