Browse Source

项目进度详情开发

anderx 1 year ago
parent
commit
421e87961d

File diff suppressed because it is too large
+ 73 - 29
src/main/java/com/goafanti/common/mapper/TaskDetailsLogMapper.xml


File diff suppressed because it is too large
+ 73 - 29
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml


+ 74 - 26
src/main/java/com/goafanti/common/model/TaskDetails.java

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2024-12-31 10:59:27
+ * @since 2025-01-02 10:56:06
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 424491606717326985L;
+    private static final long serialVersionUID = -39418349733711770L;
 
     private Integer id;
 /**
@@ -42,6 +42,30 @@ public class TaskDetails implements Serializable {
      */
     private String financeTaxationName;
 /**
+     * 上年度年份
+     */
+    private Integer lastYear;
+/**
+     * 上年度年度销售额
+     */
+    private BigDecimal lastRdSalesAmount;
+/**
+     * 上年度高新研发预算
+     */
+    private BigDecimal lastRdBudget;
+/**
+     * 上年度年份
+     */
+    private Integer beforeLastYear;
+/**
+     * 上年度年度销售额
+     */
+    private BigDecimal beforeLastRdSalesAmount;
+/**
+     * 上年度高新研发预算
+     */
+    private BigDecimal beforeLastRdBudget;
+/**
      * 职工人数
      */
     private Integer workersNumber;
@@ -282,14 +306,6 @@ public class TaskDetails implements Serializable {
      */
     private String trainingOther;
 /**
-     * 专项检查数
-     */
-    private Integer specialInspect;
-/**
-     * 模拟稽查数
-     */
-    private Integer simulatedAudit;
-/**
      * 特色工作-其他
      */
     private String featuredWorkOther;
@@ -411,6 +427,54 @@ public class TaskDetails implements Serializable {
         this.financeTaxationName = financeTaxationName;
     }
 
+    public Integer getLastYear() {
+        return lastYear;
+    }
+
+    public void setLastYear(Integer lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    public BigDecimal getLastRdSalesAmount() {
+        return lastRdSalesAmount;
+    }
+
+    public void setLastRdSalesAmount(BigDecimal lastRdSalesAmount) {
+        this.lastRdSalesAmount = lastRdSalesAmount;
+    }
+
+    public BigDecimal getLastRdBudget() {
+        return lastRdBudget;
+    }
+
+    public void setLastRdBudget(BigDecimal lastRdBudget) {
+        this.lastRdBudget = lastRdBudget;
+    }
+
+    public Integer getBeforeLastYear() {
+        return beforeLastYear;
+    }
+
+    public void setBeforeLastYear(Integer beforeLastYear) {
+        this.beforeLastYear = beforeLastYear;
+    }
+
+    public BigDecimal getBeforeLastRdSalesAmount() {
+        return beforeLastRdSalesAmount;
+    }
+
+    public void setBeforeLastRdSalesAmount(BigDecimal beforeLastRdSalesAmount) {
+        this.beforeLastRdSalesAmount = beforeLastRdSalesAmount;
+    }
+
+    public BigDecimal getBeforeLastRdBudget() {
+        return beforeLastRdBudget;
+    }
+
+    public void setBeforeLastRdBudget(BigDecimal beforeLastRdBudget) {
+        this.beforeLastRdBudget = beforeLastRdBudget;
+    }
+
     public Integer getWorkersNumber() {
         return workersNumber;
     }
@@ -891,22 +955,6 @@ public class TaskDetails implements Serializable {
         this.trainingOther = trainingOther;
     }
 
-    public Integer getSpecialInspect() {
-        return specialInspect;
-    }
-
-    public void setSpecialInspect(Integer specialInspect) {
-        this.specialInspect = specialInspect;
-    }
-
-    public Integer getSimulatedAudit() {
-        return simulatedAudit;
-    }
-
-    public void setSimulatedAudit(Integer simulatedAudit) {
-        this.simulatedAudit = simulatedAudit;
-    }
-
     public String getFeaturedWorkOther() {
         return featuredWorkOther;
     }

+ 74 - 26
src/main/java/com/goafanti/common/model/TaskDetailsLog.java

@@ -9,10 +9,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2024-12-31 10:59:33
+ * @since 2025-01-02 10:56:14
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = 627368514002233465L;
+    private static final long serialVersionUID = -84490051788119343L;
 
     private Integer id;
 /**
@@ -40,6 +40,30 @@ public class TaskDetailsLog implements Serializable {
      */
     private String financeTaxationName;
 /**
+     * 上年度年份
+     */
+    private Integer lastYear;
+/**
+     * 上年度年度销售额
+     */
+    private BigDecimal lastRdSalesAmount;
+/**
+     * 上年度高新研发预算
+     */
+    private BigDecimal lastRdBudget;
+/**
+     * 上年度年份
+     */
+    private Integer beforeLastYear;
+/**
+     * 上年度年度销售额
+     */
+    private BigDecimal beforeLastRdSalesAmount;
+/**
+     * 上年度高新研发预算
+     */
+    private BigDecimal beforeLastRdBudget;
+/**
      * 职工人数
      */
     private Integer workersNumber;
@@ -280,14 +304,6 @@ public class TaskDetailsLog implements Serializable {
      */
     private String trainingOther;
 /**
-     * 专项检查数
-     */
-    private Integer specialInspect;
-/**
-     * 模拟稽查数
-     */
-    private Integer simulatedAudit;
-/**
      * 特色工作-其他
      */
     private String featuredWorkOther;
@@ -405,6 +421,54 @@ public class TaskDetailsLog implements Serializable {
         this.financeTaxationName = financeTaxationName;
     }
 
+    public Integer getLastYear() {
+        return lastYear;
+    }
+
+    public void setLastYear(Integer lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    public BigDecimal getLastRdSalesAmount() {
+        return lastRdSalesAmount;
+    }
+
+    public void setLastRdSalesAmount(BigDecimal lastRdSalesAmount) {
+        this.lastRdSalesAmount = lastRdSalesAmount;
+    }
+
+    public BigDecimal getLastRdBudget() {
+        return lastRdBudget;
+    }
+
+    public void setLastRdBudget(BigDecimal lastRdBudget) {
+        this.lastRdBudget = lastRdBudget;
+    }
+
+    public Integer getBeforeLastYear() {
+        return beforeLastYear;
+    }
+
+    public void setBeforeLastYear(Integer beforeLastYear) {
+        this.beforeLastYear = beforeLastYear;
+    }
+
+    public BigDecimal getBeforeLastRdSalesAmount() {
+        return beforeLastRdSalesAmount;
+    }
+
+    public void setBeforeLastRdSalesAmount(BigDecimal beforeLastRdSalesAmount) {
+        this.beforeLastRdSalesAmount = beforeLastRdSalesAmount;
+    }
+
+    public BigDecimal getBeforeLastRdBudget() {
+        return beforeLastRdBudget;
+    }
+
+    public void setBeforeLastRdBudget(BigDecimal beforeLastRdBudget) {
+        this.beforeLastRdBudget = beforeLastRdBudget;
+    }
+
     public Integer getWorkersNumber() {
         return workersNumber;
     }
@@ -885,22 +949,6 @@ public class TaskDetailsLog implements Serializable {
         this.trainingOther = trainingOther;
     }
 
-    public Integer getSpecialInspect() {
-        return specialInspect;
-    }
-
-    public void setSpecialInspect(Integer specialInspect) {
-        this.specialInspect = specialInspect;
-    }
-
-    public Integer getSimulatedAudit() {
-        return simulatedAudit;
-    }
-
-    public void setSimulatedAudit(Integer simulatedAudit) {
-        this.simulatedAudit = simulatedAudit;
-    }
-
     public String getFeaturedWorkOther() {
         return featuredWorkOther;
     }