修改接口

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -37,8 +37,8 @@ public class QuestionnaireCtrl {
         //2.若recordId为空去添加上报记录，并返回自增id
         if(recordId==null) {
             Record record = new Record(questionnaire.getId(),questionnaire.getQuestionnaireName(),
-                    0,questionnaire.getPhoneNumber(),questionnaire.getCreateName(),new Date(),
-                    questionnaire.getCreateId());
+                    0,questionnaire.getWritePeople(),questionnaire.getPhoneNumber(),questionnaire.getCreateName(),
+                    new Date(),questionnaire.getCreateId());
             recordId=this.questionnaireService.insertRecord(record);
         }
         //3.根据上报记录id删除原上报数据

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

@@ -10,11 +10,20 @@ public class Questionnaire {//问卷相关数据返回Vo
     private Date createTime;//创建时间
     private List<Answer> answersList;//问卷数据
     private String createId;//上报人员唯一标识
-    private String createName;//上报人（众创空间）
+    private String createName;//所属众创空间
     private String phoneNumber;//联系方式
     private Integer type; //0暂存 1上报
+    private String writePeople;//填报人
     private List<Review>reviewList;//审核备注
 
+    public String getWritePeople() {
+        return writePeople;
+    }
+
+    public void setWritePeople(String writePeople) {
+        this.writePeople = writePeople;
+    }
+
     public List<Review> getReviewList() {
         return reviewList;
     }

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

@@ -8,11 +8,12 @@ public class Record {//上报记录表
     private String questionnaireName;//问卷名称
     private int processStatus;//上报状态，0:未上报（默认）,1:待审核, 2:驳回,3:通过
     private String reason;//驳回原因
-    private String createBy;//填报人
+    private String createBy;//所属众创空间
     private String phoneNumber;//联系方式
     private Date createTime;//上报时间
     private String createId;//上报人员唯一标识
-    private List<Review> reviews;
+    private List<Review> reviews;//评审备注
+    private String writePeople;//填报人
 
     public List<Review> getReviews() {
         return reviews;
@@ -97,11 +98,20 @@ public class Record {//上报记录表
         this.phoneNumber = phoneNumber;
     }
 
+    public String getWritePeople() {
+        return writePeople;
+    }
+
+    public void setWritePeople(String writePeople) {
+        this.writePeople = writePeople;
+    }
+
     public Record(Long questionnaireUuid, String questionnaireName, int processStatus, String phoneNumber,
-                  String createBy, Date createTime, String createId) {
+                  String createBy,String writePeople, Date createTime, String createId) {
         this.questionnaireUuid = questionnaireUuid;
         this.questionnaireName = questionnaireName;
         this.processStatus = processStatus;
+        this.writePeople=writePeople;
         this.phoneNumber = phoneNumber;
         this.createBy = createBy;
         this.createTime = createTime;

src/main/java/com/tiptimes/util/NumberUtil.java

@@ -5,7 +5,7 @@
 
 package com.tiptimes.util;
 
-import org.junit.Test;
+//import org.junit.Test;
 
 public class NumberUtil {
     public NumberUtil() {
@@ -31,7 +31,7 @@ public class NumberUtil {
         return str.matches(reg);
     }
 
-    @Test
+   // @Test
     public void main() {
         boolean uuid = isPassword("a01111");
         System.out.println(uuid);

src/main/resources/mapper/Questionnaire.xml

@@ -12,7 +12,8 @@
 			phone_number,
 			create_time,
 			create_by,
-			create_id
+			create_id,
+			write_people
 		)
 		VALUES
 		(
@@ -22,7 +23,8 @@
 			#{phoneNumber},
 			#{createTime},
 			#{createBy},
-			#{createId}
+			#{createId},
+			#{writePeople}
 		)
     </insert>
 
@@ -99,7 +101,7 @@
 
 	<select id="selectRecordList" resultType="com.tiptimes.model.Record">
 		SELECT process_status AS 'processStatus',reason,create_by AS 'createBy',
-			phone_number AS 'phoneNumber'
+			phone_number AS 'phoneNumber',write_people AS 'writePeople'
 		FROM t_record
 		WHERE questionnaire_uuid=#{questionnaireUuid}
 		<if test="createBy != null and createBy != ''">