bug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateTaskDTO.java

@@ -30,6 +30,4 @@ public class EvaluateTaskDTO extends BaseEntity {
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
     private String date;
-    private String sDate;
-    private String eDate;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -100,8 +100,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         if (StringUtils.isEmpty(evaluateTaskDTO.getStatus())) {
             evaluateTaskDTO.setStatus(null);
         }
-        evaluateTaskDTO.setEDate(evaluateTaskDTO.getDate()+" 23:59:59");
-        evaluateTaskDTO.setSDate(evaluateTaskDTO.getDate()+" 00:00:00");
+        evaluateTaskDTO.setStartTime(DateUtils.parseDate(evaluateTaskDTO.getDate() + " 00:00:00"));
+        evaluateTaskDTO.setEndTime(DateUtils.parseDate(evaluateTaskDTO.getDate() + " 23:59:59"));
         page = baseMapper.selectAppPageList(page, evaluateTaskDTO);
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -179,12 +179,11 @@
         <if test="request.status != null and '' neq request.status">
             and a.status = #{request.status}
         </if>
-        <if test="request.date != null and request.date != ''">
-         /*   and e.complete_time like concat( #{request.date}, '%')*/
+        <if test="request.date != null ">
             AND ((
-            a.start_time  &lt;= #{request.sDate} AND a.end_time >= #{request.sDate}
+            a.start_time  &lt;= #{request.startTime} AND a.end_time >= #{request.startTime}
             )
-            OR ( a.start_time  &lt;= #{request.eDate} AND a.end_time >= #{request.eDate}  ))
+            OR ( a.start_time  &lt;= #{request.endTime} AND a.end_time >= #{request.endTime}  ))
         </if>
         GROUP BY a.id
     </select>