From e3b1516b771953e0608b0e2f2f63eb9296ef3ed9 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 19 Apr 2024 18:41:33 +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

---
 src/main/resources/application.properties                     | 4 ++--
 .../resources/mybatis/datasource/bus/CorpPromiseMapper.xml    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8df26410..dd259ac5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj
 server.port=8091
 
 #??
-spring.profiles.active=me
+#spring.profiles.active=local
 #����31ʱʹ��
 #spring.profiles.active=dev
 #??
-#spring.profiles.active=master
+spring.profiles.active=master
 
 
 
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