fix

ruoyi-system/src/main/java/com/ruoyi/system/domain/TblTask.java

@@ -67,13 +67,13 @@ public class TblTask extends BaseEntity
     private String taskOtherId;
 
     /** 任务时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "任务时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "任务时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date taskTime;
 
     /** 任务要求完成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "任务要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "任务要求完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date taskReqCompleteTime;
 
     /** 任务状态 */

ruoyi-system/src/main/resources/mapper/system/TblTaskMapper.xml

@@ -66,10 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskArea != null  and taskArea != ''"> and task_area = #{taskArea}</if>
             <if test="params.searchkey != null  and params.searchkey != ''"> and  ( task_content like  concat('%', #{params.searchkey}, '%') or task_addr_road like concat('%', #{params.searchkey}, '%'))</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                and date_format(task_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                and date_format(task_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
             <if test="params.userId != null and params.userId != ''"><!-- 派发用户自己的或自己填报的或自己处理的 -->
                 <![CDATA[