已提交考核列表时间搜索修复

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">

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);
 	}