ソースを参照

咨询进度表开发

anderx 1 年間 前
コミット
3b9238e5f2
共有2 個のファイルを変更した35 個の追加85 個の削除を含む
  1. 33 56
      src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml
  2. 2 29
      src/main/java/com/goafanti/common/model/TaskDetails.java

+ 33 - 56
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -6,8 +6,6 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="uid" column="uid" jdbcType="VARCHAR"/>
         <result property="tid" column="tid" jdbcType="INTEGER"/>
-        <result property="salesAmount" column="sales_amount" jdbcType="VARCHAR"/>
-        <result property="researchAmount" column="research_amount" jdbcType="VARCHAR"/>
         <result property="workersNumber" column="workers_number" jdbcType="INTEGER"/>
         <result property="technologyNumber" column="technology_number" jdbcType="INTEGER"/>
         <result property="workersRate" column="workers_rate" jdbcType="NUMERIC"/>
@@ -36,7 +34,7 @@
     </resultMap>
 
     <sql id="TaskDetailsAllSql">
-        id, uid, tid, sales_amount, research_amount, 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, create_time
     </sql>
 
     <!--查询单个-->
@@ -49,60 +47,57 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_details(uid, tid, sales_amount, research_amount, 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,
+        insert into task_details(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)
-        values (#{uid}, #{tid}, #{salesAmount}, #{researchAmount}, #{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})
+        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})
     </insert>
 
     <insert id="insertBatch">
-        insert into task_details(uid, tid, sales_amount, research_amount, 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)
+        insert into task_details(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)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.tid}, #{entity.salesAmount}, #{entity.researchAmount}, #{entity.workersNumber},
-            #{entity.technologyNumber}, #{entity.workersRate}, #{entity.prjectApprovalNumber}, #{entity.rdBudget},
-            #{entity.rdBudgetRate}, #{entity.threeYearsRdBudgetRate}, #{entity.rdSalesAmount}, #{entity.dataCycle},
-            #{entity.actualSalesAmount}, #{entity.actualRdNumber}, #{entity.actualRdAmount}, #{entity.torchStatus},
-            #{entity.chStatus}, #{entity.statisticsStatus}, #{entity.finalSettlementStatus}, #{entity.torchOther},
-            #{entity.chOther}, #{entity.statisticsOther}, #{entity.finalSettlementOther}, #{entity.reportFormsRdNumber},
+            (#{entity.uid}, #{entity.tid}, #{entity.workersNumber}, #{entity.technologyNumber}, #{entity.workersRate},
+            #{entity.prjectApprovalNumber}, #{entity.rdBudget}, #{entity.rdBudgetRate},
+            #{entity.threeYearsRdBudgetRate}, #{entity.rdSalesAmount}, #{entity.dataCycle}, #{entity.actualSalesAmount},
+            #{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})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into task_details(uid, tid, sales_amount, research_amount, 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)
+        insert into task_details(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)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.tid}, #{entity.salesAmount}, #{entity.researchAmount}, #{entity.workersNumber},
-            #{entity.technologyNumber}, #{entity.workersRate}, #{entity.prjectApprovalNumber}, #{entity.rdBudget},
-            #{entity.rdBudgetRate}, #{entity.threeYearsRdBudgetRate}, #{entity.rdSalesAmount}, #{entity.dataCycle},
-            #{entity.actualSalesAmount}, #{entity.actualRdNumber}, #{entity.actualRdAmount}, #{entity.torchStatus},
-            #{entity.chStatus}, #{entity.statisticsStatus}, #{entity.finalSettlementStatus}, #{entity.torchOther},
-            #{entity.chOther}, #{entity.statisticsOther}, #{entity.finalSettlementOther}, #{entity.reportFormsRdNumber},
+            (#{entity.uid}, #{entity.tid}, #{entity.workersNumber}, #{entity.technologyNumber}, #{entity.workersRate},
+            #{entity.prjectApprovalNumber}, #{entity.rdBudget}, #{entity.rdBudgetRate},
+            #{entity.threeYearsRdBudgetRate}, #{entity.rdSalesAmount}, #{entity.dataCycle}, #{entity.actualSalesAmount},
+            #{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})
         </foreach>
         on duplicate key update
         uid = values(uid),
         tid = values(tid),
-        sales_amount = values(sales_amount),
-        research_amount = values(research_amount),
         workers_number = values(workers_number),
         technology_number = values(technology_number),
         workers_rate = values(workers_rate),
@@ -140,12 +135,6 @@
             <if test="tid != null">
                 tid = #{tid},
             </if>
-            <if test="salesAmount != null">
-                sales_amount = #{salesAmount},
-            </if>
-            <if test="researchAmount != null">
-                research_amount = #{researchAmount},
-            </if>
             <if test="workersNumber != null">
                 workers_number = #{workersNumber},
             </if>
@@ -241,12 +230,6 @@
             <if test="tid != null">
                 and tid = #{tid}
             </if>
-            <if test="salesAmount != null">
-                and sales_amount = #{salesAmount}
-            </if>
-            <if test="researchAmount != null">
-                and research_amount = #{researchAmount}
-            </if>
             <if test="workersNumber != null">
                 and workers_number = #{workersNumber}
             </if>
@@ -342,12 +325,6 @@
             <if test="tid != null">
                 and tid = #{tid}
             </if>
-            <if test="salesAmount != null">
-                and sales_amount = #{salesAmount}
-            </if>
-            <if test="researchAmount != null">
-                and research_amount = #{researchAmount}
-            </if>
             <if test="workersNumber != null">
                 and workers_number = #{workersNumber}
             </if>

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

@@ -1,7 +1,5 @@
 package com.goafanti.common.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,10 +9,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2024-12-26 17:11:50
+ * @since 2024-12-27 09:49:48
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 160882019590550228L;
+    private static final long serialVersionUID = -73688441969882341L;
 
     private Integer id;
     /**
@@ -26,14 +24,6 @@ public class TaskDetails implements Serializable {
      */
     private Integer tid;
     /**
-     * 销售额
-     */
-    private BigDecimal salesAmount;
-    /**
-     * 研发费用
-     */
-    private BigDecimal researchAmount;
-    /**
      * 职工人数
      */
     private Integer workersNumber;
@@ -159,22 +149,6 @@ public class TaskDetails implements Serializable {
         this.tid = tid;
     }
 
-    public BigDecimal getSalesAmount() {
-        return salesAmount;
-    }
-
-    public void setSalesAmount(BigDecimal salesAmount) {
-        this.salesAmount = salesAmount;
-    }
-
-    public BigDecimal getResearchAmount() {
-        return researchAmount;
-    }
-
-    public void setResearchAmount(BigDecimal researchAmount) {
-        this.researchAmount = researchAmount;
-    }
-
     public Integer getWorkersNumber() {
         return workersNumber;
     }
@@ -367,7 +341,6 @@ public class TaskDetails implements Serializable {
         this.aid = aid;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }