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

+ 1 - 2
src/main/java/com/goafanti/common/mapper/TaskAnnualReportMapper.xml

@@ -170,8 +170,7 @@
         where tid = #{tid} and year = #{year}
     </select>
 
-    <select id="selectThreeYear" resultType="com.goafanti.common.model.TaskAnnualReport">
-        resultMap="TaskAnnualReportMap">
+    <select id="selectThreeYear" resultMap="TaskAnnualReportMap">
         select
         <include refid="TaskAnnualReportAllSql"/>
         from task_annual_report

+ 46 - 19
src/main/java/com/goafanti/techproject/bo/TaskDetailsBo.java

@@ -77,11 +77,11 @@ public class TaskDetailsBo extends TaskDetails {
     /**
      * 立项资料编写数
      */
-    private Integer prjectApprovalWriteNumber;
+    private Integer projectApprovalWriteNumber;
     /**
      * 立项资料编写完成率
      */
-    private Double prjectApprovalWriteRate;
+    private Double projectApprovalWriteRate;
     /**
      * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
      */
@@ -98,7 +98,6 @@ public class TaskDetailsBo extends TaskDetails {
      * 加扣预申报十月其他说明
      */
     private String adPrepareOctoberOther;
-
     /**
      * 知识产权申报数
      */
@@ -203,6 +202,10 @@ public class TaskDetailsBo extends TaskDetails {
      * 评审国家级高企编号
      */
     private Integer reviewCountryNumber;
+    /**
+     * 备注说明
+     */
+    private String remarks;
 
 
     public Integer getRdReservesStatus() {
@@ -333,22 +336,6 @@ public class TaskDetailsBo extends TaskDetails {
         this.phasedContent = phasedContent;
     }
 
-    public Integer getPrjectApprovalWriteNumber() {
-        return prjectApprovalWriteNumber;
-    }
-
-    public void setPrjectApprovalWriteNumber(Integer prjectApprovalWriteNumber) {
-        this.prjectApprovalWriteNumber = prjectApprovalWriteNumber;
-    }
-
-    public Double getPrjectApprovalWriteRate() {
-        return prjectApprovalWriteRate;
-    }
-
-    public void setPrjectApprovalWriteRate(Double prjectApprovalWriteRate) {
-        this.prjectApprovalWriteRate = prjectApprovalWriteRate;
-    }
-
     public Integer getAdPrepareJulyStatus() {
         return adPrepareJulyStatus;
     }
@@ -580,4 +567,44 @@ public class TaskDetailsBo extends TaskDetails {
     public void setReviewCountryNumber(Integer reviewCountryNumber) {
         this.reviewCountryNumber = reviewCountryNumber;
     }
+
+    public String getRdAnnouncementOther() {
+        return rdAnnouncementOther;
+    }
+
+    public void setRdAnnouncementOther(String rdAnnouncementOther) {
+        this.rdAnnouncementOther = rdAnnouncementOther;
+    }
+
+    public Integer getProjectApprovalWriteNumber() {
+        return projectApprovalWriteNumber;
+    }
+
+    public void setProjectApprovalWriteNumber(Integer projectApprovalWriteNumber) {
+        this.projectApprovalWriteNumber = projectApprovalWriteNumber;
+    }
+
+    public Double getProjectApprovalWriteRate() {
+        return projectApprovalWriteRate;
+    }
+
+    public void setProjectApprovalWriteRate(Double projectApprovalWriteRate) {
+        this.projectApprovalWriteRate = projectApprovalWriteRate;
+    }
+
+    public String getFeaturedWorkOther() {
+        return featuredWorkOther;
+    }
+
+    public void setFeaturedWorkOther(String featuredWorkOther) {
+        this.featuredWorkOther = featuredWorkOther;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
 }