anderx 1 год назад
Родитель
Сommit
335dff51f4

+ 31 - 7
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -30,11 +30,13 @@
         <result property="intellectualPropertyAmount" column="intellectual_property_amount" jdbcType="VARCHAR"/>
         <result property="reportRdAmount" column="report_rd_amount" jdbcType="VARCHAR"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="downloadTime" column="download_time" jdbcType="TIMESTAMP"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="TaskDetailsAllSql">
-        id, uid, tid, workers_number, technology_number, workers_rate, prject_approval_number, rd_budget, rd_budget_rate, three_years_rd_budget_rate, rd_sales_amount, data_cycle, actual_sales_amount, actual_rd_number, actual_rd_amount, torch_status, ch_status, statistics_status, final_settlement_status, torch_other, ch_other, statistics_other, final_settlement_other, report_forms_rd_number, intellectual_property_amount, report_rd_amount, aid, create_time
+        id, uid, tid, workers_number, technology_number, workers_rate, prject_approval_number, rd_budget, rd_budget_rate, three_years_rd_budget_rate, rd_sales_amount, data_cycle, actual_sales_amount, actual_rd_number, actual_rd_amount, torch_status, ch_status, statistics_status, final_settlement_status, torch_other, ch_other, statistics_other, final_settlement_other, report_forms_rd_number, intellectual_property_amount, report_rd_amount, aid, update_time, download_time, create_time
     </sql>
 
     <!--查询单个-->
@@ -52,13 +54,13 @@
                                  actual_sales_amount, actual_rd_number, actual_rd_amount, torch_status, ch_status,
                                  statistics_status, final_settlement_status, torch_other, ch_other, statistics_other,
                                  final_settlement_other, report_forms_rd_number, intellectual_property_amount,
-                                 report_rd_amount, aid, create_time)
+                                 report_rd_amount, aid, update_time, download_time, create_time)
         values (#{uid}, #{tid}, #{workersNumber}, #{technologyNumber}, #{workersRate}, #{prjectApprovalNumber},
                 #{rdBudget}, #{rdBudgetRate}, #{threeYearsRdBudgetRate}, #{rdSalesAmount}, #{dataCycle},
                 #{actualSalesAmount}, #{actualRdNumber}, #{actualRdAmount}, #{torchStatus}, #{chStatus},
                 #{statisticsStatus}, #{finalSettlementStatus}, #{torchOther}, #{chOther}, #{statisticsOther},
                 #{finalSettlementOther}, #{reportFormsRdNumber}, #{intellectualPropertyAmount}, #{reportRdAmount},
-                #{aid}, #{createTime})
+                #{aid}, #{updateTime}, #{downloadTime}, #{createTime})
     </insert>
 
     <insert id="insertBatch">
@@ -66,7 +68,7 @@
         rd_budget, rd_budget_rate, three_years_rd_budget_rate, rd_sales_amount, data_cycle, actual_sales_amount,
         actual_rd_number, actual_rd_amount, torch_status, ch_status, statistics_status, final_settlement_status,
         torch_other, ch_other, statistics_other, final_settlement_other, report_forms_rd_number,
-        intellectual_property_amount, report_rd_amount, aid, create_time)
+        intellectual_property_amount, report_rd_amount, aid, update_time, download_time, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.uid}, #{entity.tid}, #{entity.workersNumber}, #{entity.technologyNumber}, #{entity.workersRate},
@@ -75,7 +77,8 @@
             #{entity.actualRdNumber}, #{entity.actualRdAmount}, #{entity.torchStatus}, #{entity.chStatus},
             #{entity.statisticsStatus}, #{entity.finalSettlementStatus}, #{entity.torchOther}, #{entity.chOther},
             #{entity.statisticsOther}, #{entity.finalSettlementOther}, #{entity.reportFormsRdNumber},
-            #{entity.intellectualPropertyAmount}, #{entity.reportRdAmount}, #{entity.aid}, #{entity.createTime})
+            #{entity.intellectualPropertyAmount}, #{entity.reportRdAmount}, #{entity.aid}, #{entity.updateTime},
+            #{entity.downloadTime}, #{entity.createTime})
         </foreach>
     </insert>
 
@@ -84,7 +87,7 @@
         rd_budget, rd_budget_rate, three_years_rd_budget_rate, rd_sales_amount, data_cycle, actual_sales_amount,
         actual_rd_number, actual_rd_amount, torch_status, ch_status, statistics_status, final_settlement_status,
         torch_other, ch_other, statistics_other, final_settlement_other, report_forms_rd_number,
-        intellectual_property_amount, report_rd_amount, aid, create_time)
+        intellectual_property_amount, report_rd_amount, aid, update_time, download_time, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.uid}, #{entity.tid}, #{entity.workersNumber}, #{entity.technologyNumber}, #{entity.workersRate},
@@ -93,7 +96,8 @@
             #{entity.actualRdNumber}, #{entity.actualRdAmount}, #{entity.torchStatus}, #{entity.chStatus},
             #{entity.statisticsStatus}, #{entity.finalSettlementStatus}, #{entity.torchOther}, #{entity.chOther},
             #{entity.statisticsOther}, #{entity.finalSettlementOther}, #{entity.reportFormsRdNumber},
-            #{entity.intellectualPropertyAmount}, #{entity.reportRdAmount}, #{entity.aid}, #{entity.createTime})
+            #{entity.intellectualPropertyAmount}, #{entity.reportRdAmount}, #{entity.aid}, #{entity.updateTime},
+            #{entity.downloadTime}, #{entity.createTime})
         </foreach>
         on duplicate key update
         uid = values(uid),
@@ -122,6 +126,8 @@
         intellectual_property_amount = values(intellectual_property_amount),
         report_rd_amount = values(report_rd_amount),
         aid = values(aid),
+        update_time = values(update_time),
+        download_time = values(download_time),
         create_time = values(create_time)
     </insert>
 
@@ -207,6 +213,12 @@
             <if test="aid != null and aid != ''">
                 aid = #{aid},
             </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
+            <if test="downloadTime != null">
+                download_time = #{downloadTime},
+            </if>
             <if test="createTime != null">
                 create_time = #{createTime},
             </if>
@@ -302,6 +314,12 @@
             <if test="aid != null and aid != ''">
                 and aid = #{aid}
             </if>
+            <if test="updateTime != null">
+                and update_time = #{updateTime}
+            </if>
+            <if test="downloadTime != null">
+                and download_time = #{downloadTime}
+            </if>
             <if test="createTime != null">
                 and create_time = #{createTime}
             </if>
@@ -397,6 +415,12 @@
             <if test="aid != null and aid != ''">
                 and aid = #{aid}
             </if>
+            <if test="updateTime != null">
+                and update_time = #{updateTime}
+            </if>
+            <if test="downloadTime != null">
+                and download_time = #{downloadTime}
+            </if>
             <if test="createTime != null">
                 and create_time = #{createTime}
             </if>

+ 31 - 2
src/main/java/com/goafanti/common/model/TaskDetails.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -9,10 +11,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2024-12-27 09:56:00
+ * @since 2024-12-27 10:19:47
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 842827796226394009L;
+    private static final long serialVersionUID = -76389974285490164L;
 
     private Integer id;
     /**
@@ -120,6 +122,14 @@ public class TaskDetails implements Serializable {
      */
     private String aid;
     /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 下载/打印时间
+     */
+    private Date downloadTime;
+    /**
      * 创建时间
      */
     private Date createTime;
@@ -341,6 +351,25 @@ public class TaskDetails implements Serializable {
         this.aid = aid;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getDownloadTime() {
+        return downloadTime;
+    }
+
+    public void setDownloadTime(Date downloadTime) {
+        this.downloadTime = downloadTime;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }