我的考核列表考核时间搜索修复

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 != ''" >
+        <if test="params.start != null " >
-            AND si.create_time >= #{params.startTime}
+            AND si.create_time >= #{params.start}
         </if>
-        <if test="params.endTime != null and params.endTime != ''" >
+        <if test="params.end != null " >
-            AND si.create_time &lt;= #{params.endTime}
+            AND si.create_time &lt;=  #{params.end}
         </if>
     </select>
     <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -59,6 +59,7 @@ import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -367,6 +368,16 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 				beIndicatorsVO = indicatorsMapper.selectMyPoints(params);
 			}
 		}
+		String startTime = (String) params.get("startTime");
+		String endTime = (String) params.get("endTime");
+		if (Func.isNotBlank(startTime)){
+			Date start = CommonUtil.getStartByDateStr(startTime);
+			params.put("start",start);
+		}
+		if (Func.isNotBlank(endTime)){
+			Date end = CommonUtil.getEndByDateStr(endTime);
+			params.put("end",end);
+		}
 		//查询分数
 		//查询我被考核的列表
 		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params);