添加备注

src/main/java/com/tiptimes/model/Questionnaire.java

 package com.tiptimes.model;
+
 import java.util.Date;
 import java.util.List;
 
@@ -16,7 +17,9 @@ public class Questionnaire {//问卷相关数据返回Vo
     private Integer type; //0暂存 1上报
     private String writePeople;//填报人
     private Integer qnYear; //上报年份
-    private List<Review>reviewList;//审核备注
+    private List<Review> reviewList;//审核备注
+    private Integer countYearQuestion;//统计生成问卷条数
+    private List<YearId> yearIdList;//当前年份--问题id
 
     public Integer getCountYearQuestion() {
         return countYearQuestion;
@@ -26,10 +29,6 @@ public class Questionnaire {//问卷相关数据返回Vo
         this.countYearQuestion = countYearQuestion;
     }
 
-    private Integer countYearQuestion;
-    private List<YearId> yearIdList;//当前年份--问题id
-
-
     public String getQuestionnaireUuid() {
         return questionnaireUuid;
     }
@@ -54,9 +53,13 @@ public class Questionnaire {//问卷相关数据返回Vo
         this.reviewList = reviewList;
     }
 
-    public List<YearId> getYearIdList(){return  yearIdList;}
+    public List<YearId> getYearIdList() {
+        return yearIdList;
+    }
 
-    public void setYearIdList(List<YearId> yearIdList){this.yearIdList = yearIdList;}
+    public void setYearIdList(List<YearId> yearIdList) {
+        this.yearIdList = yearIdList;
+    }
 
     public String getCreateId() {
         return createId;
@@ -146,7 +149,7 @@ public class Questionnaire {//问卷相关数据返回Vo
         this.qnYear = qnYear;
     }
 
-    public Questionnaire(Long id, String questionnaireName, int status, String createBy, Date createTime,Integer qnYear) {
+    public Questionnaire(Long id, String questionnaireName, int status, String createBy, Date createTime, Integer qnYear) {
         this.id = id;
         this.questionnaireName = questionnaireName;
         this.status = status;

src/main/java/com/tiptimes/model/Record.java

@@ -18,6 +18,10 @@ public class Record {//上报记录表
     private String writePeople;//填报人
     private Integer qnYear; //上报年份
 
+    private Integer countYear;//统计生成上报记录条数
+    private Integer start;
+    private Integer length;
+
     public Integer getCountYear() {
         return countYear;
     }
@@ -25,11 +29,6 @@ public class Record {//上报记录表
     public void setCountYear(Integer countYear) {
         this.countYear = countYear;
     }
-
-    private Integer countYear;
-    private Integer start;
-    private Integer length;
-
     public Integer getQnYear() {
         return qnYear;
     }