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

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


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


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

@@ -11,21 +11,21 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2025-01-08 09:32:44
+ * @since 2025-01-08 11:45:52
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 667946457599075721L;
+    private static final long serialVersionUID = 555984876554550380L;
 
     private Integer id;
 /**
-     * 用户ID
-     */
-    private String uid;
-/**
      * 项目编号
      */
     private Integer tid;
 /**
+     * 用户ID
+     */
+    private String uid;
+/**
      * 业务负责人
      */
     private String taskName;
@@ -270,13 +270,41 @@ public class TaskDetails implements Serializable {
      */
     private String adPrepareOctoberOther;
 /**
-     * 知识产权申报数
+     * 知识产权发明专利申报数
+     */
+    private Integer ipInventionPatentDeclare;
+/**
+     * 当年知识产权发明专利授权数
+     */
+    private Integer ipInventionPatentAuthorize;
+/**
+     * 累计知识产权发明专利授权数
+     */
+    private Integer ipInventionPatentAuthorizeCount;
+/**
+     * 知识产权实用新型申报数
+     */
+    private Integer ipUtilityModelDeclare;
+/**
+     * 当年知识产权实用新型授权数
+     */
+    private Integer ipUtilityModelAuthorize;
+/**
+     * 累计知识产权实用新型授权数
      */
-    private Integer ipDeclare;
+    private Integer ipUtilityModelAuthorizeCount;
 /**
-     * 知识产权授权数
+     * 知识产权软著申报
      */
-    private Integer ipAuthorize;
+    private Integer ipSoftwareWorksDeclare;
+/**
+     * 当年知识产权软著授权数
+     */
+    private Integer ipSoftwareWorksAuthorize;
+/**
+     * 累计知识产权软著授权数
+     */
+    private Integer ipSoftwareWorksAuthorizeCount;
 /**
      * 知识产权高新数
      */
@@ -318,10 +346,6 @@ public class TaskDetails implements Serializable {
      */
     private String trainingOther;
 /**
-     * 特色工作-其他
-     */
-    private String featuredWorkOther;
-/**
      * 高新认定评价估分
      */
     private Integer htScore;
@@ -391,14 +415,6 @@ public class TaskDetails implements Serializable {
         this.id = id;
     }
 
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
     public Integer getTid() {
         return tid;
     }
@@ -407,6 +423,14 @@ public class TaskDetails implements Serializable {
         this.tid = tid;
     }
 
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
     public String getTaskName() {
         return taskName;
     }
@@ -895,20 +919,76 @@ public class TaskDetails implements Serializable {
         this.adPrepareOctoberOther = adPrepareOctoberOther;
     }
 
-    public Integer getIpDeclare() {
-        return ipDeclare;
+    public Integer getIpInventionPatentDeclare() {
+        return ipInventionPatentDeclare;
+    }
+
+    public void setIpInventionPatentDeclare(Integer ipInventionPatentDeclare) {
+        this.ipInventionPatentDeclare = ipInventionPatentDeclare;
+    }
+
+    public Integer getIpInventionPatentAuthorize() {
+        return ipInventionPatentAuthorize;
+    }
+
+    public void setIpInventionPatentAuthorize(Integer ipInventionPatentAuthorize) {
+        this.ipInventionPatentAuthorize = ipInventionPatentAuthorize;
+    }
+
+    public Integer getIpInventionPatentAuthorizeCount() {
+        return ipInventionPatentAuthorizeCount;
+    }
+
+    public void setIpInventionPatentAuthorizeCount(Integer ipInventionPatentAuthorizeCount) {
+        this.ipInventionPatentAuthorizeCount = ipInventionPatentAuthorizeCount;
+    }
+
+    public Integer getIpUtilityModelDeclare() {
+        return ipUtilityModelDeclare;
+    }
+
+    public void setIpUtilityModelDeclare(Integer ipUtilityModelDeclare) {
+        this.ipUtilityModelDeclare = ipUtilityModelDeclare;
     }
 
-    public void setIpDeclare(Integer ipDeclare) {
-        this.ipDeclare = ipDeclare;
+    public Integer getIpUtilityModelAuthorize() {
+        return ipUtilityModelAuthorize;
     }
 
-    public Integer getIpAuthorize() {
-        return ipAuthorize;
+    public void setIpUtilityModelAuthorize(Integer ipUtilityModelAuthorize) {
+        this.ipUtilityModelAuthorize = ipUtilityModelAuthorize;
     }
 
-    public void setIpAuthorize(Integer ipAuthorize) {
-        this.ipAuthorize = ipAuthorize;
+    public Integer getIpUtilityModelAuthorizeCount() {
+        return ipUtilityModelAuthorizeCount;
+    }
+
+    public void setIpUtilityModelAuthorizeCount(Integer ipUtilityModelAuthorizeCount) {
+        this.ipUtilityModelAuthorizeCount = ipUtilityModelAuthorizeCount;
+    }
+
+    public Integer getIpSoftwareWorksDeclare() {
+        return ipSoftwareWorksDeclare;
+    }
+
+    public void setIpSoftwareWorksDeclare(Integer ipSoftwareWorksDeclare) {
+        this.ipSoftwareWorksDeclare = ipSoftwareWorksDeclare;
+    }
+
+    public Integer getIpSoftwareWorksAuthorize() {
+        return ipSoftwareWorksAuthorize;
+    }
+
+    public void setIpSoftwareWorksAuthorize(Integer ipSoftwareWorksAuthorize) {
+        this.ipSoftwareWorksAuthorize = ipSoftwareWorksAuthorize;
+    }
+
+    public Integer getIpSoftwareWorksAuthorizeCount() {
+        return ipSoftwareWorksAuthorizeCount;
+    }
+
+    public void setIpSoftwareWorksAuthorizeCount(Integer ipSoftwareWorksAuthorizeCount) {
+        this.ipSoftwareWorksAuthorizeCount = ipSoftwareWorksAuthorizeCount;
     }
 
     public Integer getIpHt() {
@@ -991,14 +1071,6 @@ public class TaskDetails implements Serializable {
         this.trainingOther = trainingOther;
     }
 
-    public String getFeaturedWorkOther() {
-        return featuredWorkOther;
-    }
-
-    public void setFeaturedWorkOther(String featuredWorkOther) {
-        this.featuredWorkOther = featuredWorkOther;
-    }
-
     public Integer getHtScore() {
         return htScore;
     }

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

@@ -9,10 +9,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2025-01-08 09:32:57
+ * @since 2025-01-08 11:46:00
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = -31396895327675799L;
+    private static final long serialVersionUID = 700181240846538593L;
 
     private Integer id;
 /**
@@ -268,13 +268,41 @@ public class TaskDetailsLog implements Serializable {
      */
     private String adPrepareOctoberOther;
 /**
-     * 知识产权申报数
+     * 知识产权发明专利申报数
      */
-    private Integer ipDeclare;
+    private Integer ipInventionPatentDeclare;
 /**
-     * 知识产权授权数
+     * 当年知识产权发明专利授权数
      */
-    private Integer ipAuthorize;
+    private Integer ipInventionPatentAuthorize;
+/**
+     * 累计知识产权发明专利授权数
+     */
+    private Integer ipInventionPatentAuthorizeCount;
+/**
+     * 知识产权实用新型申报数
+     */
+    private Integer ipUtilityModelDeclare;
+/**
+     * 当年知识产权实用新型授权数
+     */
+    private Integer ipUtilityModelAuthorize;
+/**
+     * 累计知识产权实用新型授权数
+     */
+    private Integer ipUtilityModelAuthorizeCount;
+/**
+     * 知识产权软著申报数
+     */
+    private Integer ipSoftwareWorksDeclare;
+/**
+     * 当年知识产权软著授权数
+     */
+    private Integer ipSoftwareWorksAuthorize;
+/**
+     * 累计知识产权软著授权数
+     */
+    private Integer ipSoftwareWorksAuthorizeCount;
 /**
      * 知识产权高新数
      */
@@ -316,10 +344,6 @@ public class TaskDetailsLog implements Serializable {
      */
     private String trainingOther;
 /**
-     * 特色工作-其他
-     */
-    private String featuredWorkOther;
-/**
      * 高新认定评价估分
      */
     private Integer htScore;
@@ -889,20 +913,76 @@ public class TaskDetailsLog implements Serializable {
         this.adPrepareOctoberOther = adPrepareOctoberOther;
     }
 
-    public Integer getIpDeclare() {
-        return ipDeclare;
+    public Integer getIpInventionPatentDeclare() {
+        return ipInventionPatentDeclare;
+    }
+
+    public void setIpInventionPatentDeclare(Integer ipInventionPatentDeclare) {
+        this.ipInventionPatentDeclare = ipInventionPatentDeclare;
+    }
+
+    public Integer getIpInventionPatentAuthorize() {
+        return ipInventionPatentAuthorize;
+    }
+
+    public void setIpInventionPatentAuthorize(Integer ipInventionPatentAuthorize) {
+        this.ipInventionPatentAuthorize = ipInventionPatentAuthorize;
+    }
+
+    public Integer getIpInventionPatentAuthorizeCount() {
+        return ipInventionPatentAuthorizeCount;
     }
 
-    public void setIpDeclare(Integer ipDeclare) {
-        this.ipDeclare = ipDeclare;
+    public void setIpInventionPatentAuthorizeCount(Integer ipInventionPatentAuthorizeCount) {
+        this.ipInventionPatentAuthorizeCount = ipInventionPatentAuthorizeCount;
     }
 
-    public Integer getIpAuthorize() {
-        return ipAuthorize;
+    public Integer getIpUtilityModelDeclare() {
+        return ipUtilityModelDeclare;
     }
 
-    public void setIpAuthorize(Integer ipAuthorize) {
-        this.ipAuthorize = ipAuthorize;
+    public void setIpUtilityModelDeclare(Integer ipUtilityModelDeclare) {
+        this.ipUtilityModelDeclare = ipUtilityModelDeclare;
+    }
+
+    public Integer getIpUtilityModelAuthorize() {
+        return ipUtilityModelAuthorize;
+    }
+
+    public void setIpUtilityModelAuthorize(Integer ipUtilityModelAuthorize) {
+        this.ipUtilityModelAuthorize = ipUtilityModelAuthorize;
+    }
+
+    public Integer getIpUtilityModelAuthorizeCount() {
+        return ipUtilityModelAuthorizeCount;
+    }
+
+    public void setIpUtilityModelAuthorizeCount(Integer ipUtilityModelAuthorizeCount) {
+        this.ipUtilityModelAuthorizeCount = ipUtilityModelAuthorizeCount;
+    }
+
+    public Integer getIpSoftwareWorksDeclare() {
+        return ipSoftwareWorksDeclare;
+    }
+
+    public void setIpSoftwareWorksDeclare(Integer ipSoftwareWorksDeclare) {
+        this.ipSoftwareWorksDeclare = ipSoftwareWorksDeclare;
+    }
+
+    public Integer getIpSoftwareWorksAuthorize() {
+        return ipSoftwareWorksAuthorize;
+    }
+
+    public void setIpSoftwareWorksAuthorize(Integer ipSoftwareWorksAuthorize) {
+        this.ipSoftwareWorksAuthorize = ipSoftwareWorksAuthorize;
+    }
+
+    public Integer getIpSoftwareWorksAuthorizeCount() {
+        return ipSoftwareWorksAuthorizeCount;
+    }
+
+    public void setIpSoftwareWorksAuthorizeCount(Integer ipSoftwareWorksAuthorizeCount) {
+        this.ipSoftwareWorksAuthorizeCount = ipSoftwareWorksAuthorizeCount;
     }
 
     public Integer getIpHt() {
@@ -985,14 +1065,6 @@ public class TaskDetailsLog implements Serializable {
         this.trainingOther = trainingOther;
     }
 
-    public String getFeaturedWorkOther() {
-        return featuredWorkOther;
-    }
-
-    public void setFeaturedWorkOther(String featuredWorkOther) {
-        this.featuredWorkOther = featuredWorkOther;
-    }
-
     public Integer getHtScore() {
         return htScore;
     }