Browse Source

项目进度表开发

anderx 1 year ago
parent
commit
c582e0ef89

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


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


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

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2025-01-08 11:45:52
+ * @since 2025-01-08 17:00:21
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 555984876554550380L;
+    private static final long serialVersionUID = -45589086664775730L;
 
     private Integer id;
 /**
@@ -134,6 +134,10 @@ public class TaskDetails implements Serializable {
      */
     private Double threeYearsActualRdRate;
 /**
+     * 研发预算完成进度
+     */
+    private Double rdCompletionProgress;
+/**
      * 火炬统计 0=其他,1=待完成,2=已完成,3=合同无此项
      */
     private Integer torchStatus;
@@ -647,6 +651,14 @@ public class TaskDetails implements Serializable {
         this.threeYearsActualRdRate = threeYearsActualRdRate;
     }
 
+    public Double getRdCompletionProgress() {
+        return rdCompletionProgress;
+    }
+
+    public void setRdCompletionProgress(Double rdCompletionProgress) {
+        this.rdCompletionProgress = rdCompletionProgress;
+    }
+
     public Integer getTorchStatus() {
         return torchStatus;
     }

+ 14 - 2
src/main/java/com/goafanti/common/model/TaskDetailsLog.java

@@ -9,10 +9,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2025-01-08 11:46:00
+ * @since 2025-01-08 17:00:27
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = 700181240846538593L;
+    private static final long serialVersionUID = 235148310992838950L;
 
     private Integer id;
 /**
@@ -132,6 +132,10 @@ public class TaskDetailsLog implements Serializable {
      */
     private Double threeYearsActualRdRate;
 /**
+     * 研发预算完成进度
+     */
+    private Double rdCompletionProgress;
+/**
      * 火炬统计 0=其他,1=待完成,2=已完成,3=合同无此项
      */
     private Integer torchStatus;
@@ -641,6 +645,14 @@ public class TaskDetailsLog implements Serializable {
         this.threeYearsActualRdRate = threeYearsActualRdRate;
     }
 
+    public Double getRdCompletionProgress() {
+        return rdCompletionProgress;
+    }
+
+    public void setRdCompletionProgress(Double rdCompletionProgress) {
+        this.rdCompletionProgress = rdCompletionProgress;
+    }
+
     public Integer getTorchStatus() {
         return torchStatus;
     }