From 704d45c9557c7fbe7fa39a9a744e42cff538b3fd Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 4 Feb 2024 14:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=8F=90=E4=BA=A4=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/supervise/mapper/IndicatorsMapper.xml    |  8 ++++----
 .../supervise/service/impl/ClassifyServiceImpl.java    | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
index 8dcda7120..40e2e1a5c 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
@@ -54,11 +54,11 @@
         <if test="params.assessDept != null and params.assessDept != ''" >
             and si.assess_dept = #{params.assessDept}
         </if>
-        <if test="params.startTime != null and params.startTime != ''" >
-            and date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
+        <if test="params.start != null " >
+            and si.create_time >= #{params.start}
         </if>
-        <if test="params.endTime != null and params.endTime != ''" >
-            and date_format(si.create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
+        <if test="params.end != null " >
+            and si.create_time &lt;= (#{params.end}
         </if>
     </select>
     <select id="selectBeMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index 4039fb8db..6c45c3de7 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -309,6 +309,16 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			return null;
 		}
 		params.put("userId", userId);
+		String startTime =(String) params.get("startTime");
+		if (Func.isNotBlank(startTime)){
+			Date start = CommonUtil.getStartByDateStr(startTime);
+			params.put("start",start);
+		}
+		String endTime =(String) params.get("endTime");
+		if (Func.isNotBlank(endTime)){
+			Date end = CommonUtil.getEndByDateStr(endTime);
+			params.put("end",end);
+		}
 		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectMyApiIndicators(page, params);
 		return R.data(indicatorsVOPage);
 	}