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

Разница между файлами не показана из-за своего большого размера
+ 40 - 7
src/main/java/com/goafanti/common/mapper/TaskDetailsLogMapper.xml


Разница между файлами не показана из-за своего большого размера
+ 40 - 7
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml


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

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2025-01-02 10:56:06
+ * @since 2025-01-08 09:32:44
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = -39418349733711770L;
+    private static final long serialVersionUID = 667946457599075721L;
 
     private Integer id;
 /**
@@ -110,6 +110,18 @@ public class TaskDetails implements Serializable {
      */
     private Integer actualRdNumber;
 /**
+     * 实际委外数
+     */
+    private Integer actualOutsourcingNumber;
+/**
+     * 实际合作项目数
+     */
+    private Integer actualCooperateNumber;
+/**
+     * 实际技术合同登记数
+     */
+    private Integer actualRegistrationNumber;
+/**
      * 实际归集研发费用
      */
     private BigDecimal actualRdAmount;
@@ -563,6 +575,30 @@ public class TaskDetails implements Serializable {
         this.actualRdNumber = actualRdNumber;
     }
 
+    public Integer getActualOutsourcingNumber() {
+        return actualOutsourcingNumber;
+    }
+
+    public void setActualOutsourcingNumber(Integer actualOutsourcingNumber) {
+        this.actualOutsourcingNumber = actualOutsourcingNumber;
+    }
+
+    public Integer getActualCooperateNumber() {
+        return actualCooperateNumber;
+    }
+
+    public void setActualCooperateNumber(Integer actualCooperateNumber) {
+        this.actualCooperateNumber = actualCooperateNumber;
+    }
+
+    public Integer getActualRegistrationNumber() {
+        return actualRegistrationNumber;
+    }
+
+    public void setActualRegistrationNumber(Integer actualRegistrationNumber) {
+        this.actualRegistrationNumber = actualRegistrationNumber;
+    }
+
     public BigDecimal getActualRdAmount() {
         return actualRdAmount;
     }

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

@@ -9,10 +9,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2025-01-02 10:56:14
+ * @since 2025-01-08 09:32:57
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = -84490051788119343L;
+    private static final long serialVersionUID = -31396895327675799L;
 
     private Integer id;
 /**
@@ -108,6 +108,18 @@ public class TaskDetailsLog implements Serializable {
      */
     private Integer actualRdNumber;
 /**
+     * 实际委外数
+     */
+    private Integer actualOutsourcingNumber;
+/**
+     * 实际合作项目数
+     */
+    private Integer actualCooperateNumber;
+/**
+     * 实际技术合同登记数
+     */
+    private Integer actualRegistrationNumber;
+/**
      * 实际归集研发费用
      */
     private BigDecimal actualRdAmount;
@@ -557,6 +569,30 @@ public class TaskDetailsLog implements Serializable {
         this.actualRdNumber = actualRdNumber;
     }
 
+    public Integer getActualOutsourcingNumber() {
+        return actualOutsourcingNumber;
+    }
+
+    public void setActualOutsourcingNumber(Integer actualOutsourcingNumber) {
+        this.actualOutsourcingNumber = actualOutsourcingNumber;
+    }
+
+    public Integer getActualCooperateNumber() {
+        return actualCooperateNumber;
+    }
+
+    public void setActualCooperateNumber(Integer actualCooperateNumber) {
+        this.actualCooperateNumber = actualCooperateNumber;
+    }
+
+    public Integer getActualRegistrationNumber() {
+        return actualRegistrationNumber;
+    }
+
+    public void setActualRegistrationNumber(Integer actualRegistrationNumber) {
+        this.actualRegistrationNumber = actualRegistrationNumber;
+    }
+
     public BigDecimal getActualRdAmount() {
         return actualRdAmount;
     }