From bafe944e77c154de408fc1bc191be4dbc70334b0 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 24 Apr 2024 14:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E6=89=BF=E8=AF=BA=E4=B9=A6=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/datasource/bus/CorpPromiseMapper.xml  | 3 +++
 .../mybatis/datasource/bus/CorpPromisePeopleMapper.xml      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
index be998e9e..369afaba 100644
--- a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
+++ b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
@@ -133,6 +133,9 @@
 		<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"><!-- 关键词检索 -->
 			and dept.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
 		</if>
+		<if test="pd.ADDSTART != null and pd.ADDSTART != '' and pd.ADDEND != null and pd.ADDEND != ''"><!-- 日期范围检索 -->
+			and DATE(f.CREATTIME) between DATE(#{pd.ADDSTART}) and DATE(#{pd.ADDEND})
+		</if>
 		and dept.`NAME` is not null
 		GROUP BY
 		f.PROMISE_ID
diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
index 7f80accf..96d63dc6 100644
--- a/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
+++ b/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
@@ -219,6 +219,9 @@
 		<if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 关键词检索 -->
 			and f.USER_ID = #{pd.USER_ID}
 		</if>
+		<if test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''"><!-- 日期范围检索 -->
+			and DATE(f.SIGNTIME) between DATE(#{pd.STARTTIME}) and DATE(#{pd.ENDTIME})
+		</if>
 		AND f.ISPROMISE_PEOPLE = '0'
 		ORDER BY f.SIGNTIME desc
 	</select>
@@ -242,6 +245,9 @@
 			and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 		</if>
 		AND f.ISPROMISE_PEOPLE = '0'
+		<if test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''"><!-- 日期范围检索 -->
+			and DATE(f.SIGNTIME) between DATE(#{pd.STARTTIME}) and DATE(#{pd.ENDTIME})
+		</if>
 		ORDER BY f.SIGNTIME desc
 	</select>