Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java

@@ -1,16 +1,12 @@
 package org.dromara.business.domain.vo;
 
-import java.awt.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 import org.dromara.business.domain.BusinessTask;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -75,7 +71,7 @@ public class BusinessTaskVo implements Serializable {
 
     @ExcelProperty(value = "完成时间")
     private Long createBy;
-
+    private Date createTime;
     private String nickName;
     private Long createDept;
     private String deptName;
@@ -89,6 +85,8 @@ public class BusinessTaskVo implements Serializable {
     private String operatName;
     //飞行时间
     private Date flightTime;
+
+    private Date operatTime;
     //飞行说明
     private String flightExplain;
 

dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="create_by" property="createBy" />
         <result column="nick_name" property="nickName" />
         <result column="create_dept" property="createDept" />
+        <result column="create_time" property="createTime" />
         <result column="dept_name" property="deptName" />
         <result column="job_id" property="jobId" />
         <result column="job_name" property="jobName" />
@@ -24,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="verbal_trick" property="verbalTrick" />
         <result column="operatId" property="operatId" />
         <result column="operatName" property="operatName" />
+        <result column="operatTime" property="operatTime" />
         <result column="flightTime" property="flightTime" />
         <result column="flightExplain" property="flightExplain" />
     </resultMap>
@@ -53,11 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t.STATUS,
         t.create_by,
         t.nick_name,
+        t.create_time,
         t.create_dept,
         t.dept_name,
         p.user_id AS operatId,
         p.nick_name AS operatName,
         p.flight_time AS flightTime,
+        p.create_time AS operatTime,
         p.flight_explain AS flightExplain
         FROM
         business_task t