添加字段

src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java

@@ -38,6 +38,8 @@ public class TaskConvert {
         model.setStatus(StatusEnum.getByCode(entity.getStatus()));
         model.setStartTime(entity.getStartTime());
         model.setEndTime(entity.getEndTime());
+        model.setActualStartTime(entity.getActualStartTime());
+        model.setActualEndTime(entity.getActualEndTime());
         model.setDescription(entity.getDescription());
         model.setCreateBy(entity.getCreateBy());
         model.setCreateTime(entity.getCreateTime());
@@ -71,6 +73,8 @@ public class TaskConvert {
         entity.setStatus(model.getStatus() != null ? model.getStatus().getCode() : null);
         entity.setStartTime(model.getStartTime());
         entity.setEndTime(model.getEndTime());
+        entity.setActualStartTime(model.getActualStartTime());
+        entity.setActualEndTime(model.getActualEndTime());
         entity.setDescription(model.getDescription());
         entity.setCreateBy(model.getCreateBy());
         entity.setCreateTime(model.getCreateTime());

src/main/java/com/ruoyi/task/domain/model/Task.java

@@ -48,6 +48,12 @@ public class Task {
     /** 结束时间 */
     private Date endTime;
 
+    /** 实际开始时间 */
+    private Date actualStartTime;
+
+    /** 实际结束时间 */
+    private Date actualEndTime;
+
     /** 描述 */
     private String description;
 
@@ -155,6 +161,22 @@ public class Task {
         this.endTime = endTime;
     }
 
+    public Date getActualStartTime() {
+        return actualStartTime;
+    }
+
+    public void setActualStartTime(Date actualStartTime) {
+        this.actualStartTime = actualStartTime;
+    }
+
+    public Date getActualEndTime() {
+        return actualEndTime;
+    }
+
+    public void setActualEndTime(Date actualEndTime) {
+        this.actualEndTime = actualEndTime;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -217,6 +239,8 @@ public class Task {
                 ", status=" + status +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +
+                ", actualStartTime=" + actualStartTime +
+                ", actualEndTime=" + actualEndTime +
                 ", description='" + description + '\'' +
                 '}';
     }

src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java

@@ -47,6 +47,12 @@ public class TaskInfoEntity extends BaseEntity {
     /** 结束时间 */
     private Date endTime;
 
+    /** 实际开始时间 */
+    private Date actualStartTime;
+
+    /** 实际结束时间 */
+    private Date actualEndTime;
+
     /** 描述 */
     private String description;
 
@@ -138,6 +144,22 @@ public class TaskInfoEntity extends BaseEntity {
         this.endTime = endTime;
     }
 
+    public Date getActualStartTime() {
+        return actualStartTime;
+    }
+
+    public void setActualStartTime(Date actualStartTime) {
+        this.actualStartTime = actualStartTime;
+    }
+
+    public Date getActualEndTime() {
+        return actualEndTime;
+    }
+
+    public void setActualEndTime(Date actualEndTime) {
+        this.actualEndTime = actualEndTime;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -160,6 +182,8 @@ public class TaskInfoEntity extends BaseEntity {
                 ", status='" + status + '\'' +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +
+                ", actualStartTime=" + actualStartTime +
+                ", actualEndTime=" + actualEndTime +
                 ", description='" + description + '\'' +
                 '}';
     }

src/main/resources/db/migration/V4__Add_actual_time_columns.sql

@@ -0,0 +1,6 @@
+-- ----------------------------
+-- 添加任务实际执行时间和实际结束时间字段
+-- ----------------------------
+ALTER TABLE task_info
+ADD COLUMN actual_start_time DATETIME DEFAULT NULL COMMENT '实际开始时间' AFTER start_time,
+ADD COLUMN actual_end_time DATETIME DEFAULT NULL COMMENT '实际结束时间' AFTER end_time;

src/main/resources/mapper/task/TaskInfoMapper.xml

@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"             column="status"                />
         <result property="startTime"          column="start_time"           />
         <result property="endTime"            column="end_time"             />
+        <result property="actualStartTime"    column="actual_start_time"     />
+        <result property="actualEndTime"      column="actual_end_time"       />
         <result property="description"        column="description"           />
         <result property="createBy"           column="create_by"             />
         <result property="createTime"         column="create_time"           />
@@ -26,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectTaskInfoVo">
         select id, task_name, task_category, task_type, plan_id, route_id, 
-               uav_id, execute_type, status, start_time, end_time, description, 
+               uav_id, execute_type, status, start_time, end_time, actual_start_time, actual_end_time, description, 
                create_by, create_time, update_by, update_time, remark
         from task_info
     </sql>
@@ -79,6 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">status,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="actualStartTime != null">actual_start_time,</if>
+            <if test="actualEndTime != null">actual_end_time,</if>
             <if test="description != null and description != ''">description,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="remark != null and remark != ''">remark,</if>
@@ -95,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">#{status},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="actualStartTime != null">#{actualStartTime},</if>
+            <if test="actualEndTime != null">#{actualEndTime},</if>
             <if test="description != null and description != ''">#{description},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
@@ -115,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="actualStartTime != null">actual_start_time = #{actualStartTime},</if>
+            <if test="actualEndTime != null">actual_end_time = #{actualEndTime},</if>
             <if test="description != null and description != ''">description = #{description},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>