From 78251208578c190d04d25a1f5f8842a548caa58a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 6 Jun 2024 17:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BasicdataClientMapper.xml          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
index 46f30ff07..7b32b4177 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
@@ -151,18 +151,21 @@
             <if test="param.clientType != null and param.clientType != ''">
                 AND lbc.client_type = #{param.clientType}
             </if>
-            <if test="param.contractStartTime != null and param.contractStartTime != ''">
-                AND DATE_FORMAT(lbc.contract_start_time,, '%Y-%m-%d') > DATE_FORMAT(#{param.contractStartTime}, '%Y-%m-%d')
-            </if>
-            <if test="param.contractEntTime != null and param.contractEntTime != ''">
-                AND DATE_FORMAT(lbc.contract_ent_time,, '%Y-%m-%d') &lt; DATE_FORMAT(#{param.contractEntTime}, '%Y-%m-%d')
+            <if test="param.typeServiceName != null and param.typeServiceName != ''">
+                AND lbc.type_ervice = #{param.typeServiceName}
             </if>
+<!--            <if test="param.contractStartTime != null and param.contractStartTime != ''">-->
+<!--                AND DATE_FORMAT(lbc.contract_start_time,, '%Y-%m-%d') > DATE_FORMAT(#{param.contractStartTime}, '%Y-%m-%d')-->
+<!--            </if>-->
+<!--            <if test="param.contractEntTime != null and param.contractEntTime != ''">-->
+<!--                AND DATE_FORMAT(lbc.contract_ent_time,, '%Y-%m-%d') &lt; DATE_FORMAT(#{param.contractEntTime}, '%Y-%m-%d')-->
+<!--            </if>-->
             <if test="param.brandName != null and param.brandName != ''">
                 AND t.aaa LIKE CONCAT('%', #{param.brandName}, '%')
             </if>
-            <if test="param.stratTimeDate != null and param.stratTimeDate != '' and param.endTimeDate != null and param.endTimeDate != ''">
-                AND lbc.contract_start_time >=  DATE_FORMAT(#{param.stratTimeDate}, '%Y-%m-%d')
-                AND lbc.contract_ent_time &lt;= DATE_FORMAT(#{param.endTimeDate}, '%Y-%m-%d')
+            <if test="param.startDate != null and param.startDate != '' and param.endDate != null and param.endDate != ''">
+                AND lbc.contract_start_time >=  DATE_FORMAT(#{param.startDate}, '%Y-%m-%d')
+                AND lbc.contract_ent_time &lt;= DATE_FORMAT(#{param.endDate}, '%Y-%m-%d')
             </if>
         </where>
         GROUP BY