From 2f630531b1841ac17549a2520ec4b8924a642a77 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 4 Feb 2024 12:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=80=83=E6=A0=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E6=88=91=E7=9A=84=E8=80=83=E6=A0=B8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=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 61d509e46..f2a52dc12 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
@@ -69,11 +69,11 @@
         sup_indicators AS si
         LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id AND sc.is_deleted = 0
         WHERE si.assess_dept = #{params.deptId} AND si.is_deleted = 0
-        <if test="params.startTime != null and params.startTime != ''" >
-            AND si.create_time >= #{params.startTime}
+        <if test="params.start != null and params.start != ''" >
+            AND si.create_time >= #{params.start}
         </if>
-        <if test="params.endTime != null and params.endTime != ''" >
-            AND si.create_time &lt;= #{params.endTime}
+        <if test="params.end != null and params.end != ''" >
+            AND si.create_time &lt;= #{params.end}
         </if>
     </select>
     <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">
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 883d57485..42c9275e8 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
@@ -42,6 +42,7 @@ import com.logpm.supervise.wrapper.IndicatorsWrapper;
 import com.logpm.supervise.wrapper.PointsWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -59,6 +60,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -365,6 +367,14 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 				beIndicatorsVO = indicatorsMapper.selectMyPoints(params);
 			}
 		}
+		if (Func.isNotBlank((String)params.get("startTime"))){
+			Date start = CommonUtil.getStartByDateStr((String)params.get("startTime"));
+			params.put("start",start);
+		}
+		if (Func.isNotBlank((String)params.get("endTime"))){
+			Date end = CommonUtil.getStartByDateStr((String)params.get("endTime"));
+			params.put("end",end);
+		}
 		//查询分数
 		//查询我被考核的列表
 		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params);