添加查询列表接口

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

@@ -37,7 +37,8 @@ public class QuestionnaireCtrl {
         //2.若recordId为空去添加上报记录，并返回自增id
         if(recordId==null) {
             Record record = new Record(questionnaire.getId(),questionnaire.getQuestionnaireName(),
-                    0,"",questionnaire.getCreateName(),new Date(),questionnaire.getCreateId());
+                    0,questionnaire.getPhoneNumber(),questionnaire.getCreateName(),new Date(),
+                    questionnaire.getCreateId());
             recordId=this.questionnaireService.insertRecord(record);
         }
         //3.根据上报记录id删除原上报数据
@@ -112,6 +113,8 @@ public class QuestionnaireCtrl {
         }
         //3.根据记录id查询状态
         Record record= this.questionnaireService.selectById(recordId);
+        data.put("createBy",record.getCreateBy());
+        data.put("phoneNumber",record.getPhoneNumber());
         if(record.getProcessStatus()==2) {
           data.put("reason", record.getReason());
         }
@@ -148,5 +151,24 @@ public class QuestionnaireCtrl {
         return map;
     }
 
+
+
+    /**
+     * 按条件查询上报记录
+     * @param record 筛选条件
+     * @return
+     */
+    @RequestMapping({"/selectRecordList"})
+    @ResponseBody
+    public Map<String, Object> selectRecordList(Record record){
+        List<Record> recordList= this.questionnaireService.selectRecordList(record);
+        Map<String, Object> map = new HashMap();
+        Map<String, Object> data = new HashMap();
+        map.put("result", true);
+        map.put("msg", "");
+        data.put("recordList",recordList);
+        map.put("data",data);
+        return map;
+    }
 }
 

src/main/java/com/tiptimes/dao/QuestionnaireDao.java

@@ -30,4 +30,6 @@ public interface QuestionnaireDao {
     List<Review> selectReviewByRecordId(@Param("recordId")Long recordId);
 
     Record selectById(Long recordId);
+
+    List<Record> selectRecordList(Record record);
 }

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

@@ -11,6 +11,7 @@ public class Questionnaire {//问卷相关数据返回Vo
     private List<Answer> answersList;//问卷数据
     private String createId;//上报人员唯一标识
     private String createName;//上报人（众创空间）
+    private String phoneNumber;//联系方式
     private Integer type; //0暂存 1上报
     private List<Review>reviewList;//审核备注
 
@@ -94,6 +95,14 @@ public class Questionnaire {//问卷相关数据返回Vo
         this.createTime = createTime;
     }
 
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
     public Questionnaire(Long id, String questionnaireName, int status, String createBy, Date createTime) {
         this.id = id;
         this.questionnaireName = questionnaireName;

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

@@ -8,7 +8,8 @@ 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;
@@ -88,12 +89,20 @@ public class Record {//上报记录表
     public Record() {
     }
 
-    public Record(Long questionnaireUuid, String questionnaireName, int processStatus, String reason,
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public Record(Long questionnaireUuid, String questionnaireName, int processStatus, String phoneNumber,
                   String createBy, Date createTime, String createId) {
         this.questionnaireUuid = questionnaireUuid;
         this.questionnaireName = questionnaireName;
         this.processStatus = processStatus;
-        this.reason = reason;
+        this.phoneNumber = phoneNumber;
         this.createBy = createBy;
         this.createTime = createTime;
         this.createId = createId;

src/main/java/com/tiptimes/service/QuestionnaireService.java

@@ -79,6 +79,13 @@ public interface QuestionnaireService {
    * @return
    */
   Record selectById(Long recordId);
+
+  /**
+   * 按条件查询上报记录
+   * @param record 筛选条件
+   * @return
+   */
+  List<Record> selectRecordList(Record record);
 }
 
 

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -121,4 +121,14 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     public Record selectById(Long recordId) {
         return questionnaireDao.selectById(recordId);
     }
+
+    /**
+     * 按条件查询上报记录
+     * @param record 筛选条件
+     * @return
+     */
+    @Override
+    public List<Record> selectRecordList(Record record) {
+        return questionnaireDao.selectRecordList(record);
+    }
 }

src/main/resources/mapper/Questionnaire.xml

@@ -9,7 +9,7 @@
 			questionnaire_uuid,
 			questionnaire_name,
 			process_status,
-			reason,
+			phone_number,
 			create_time,
 			create_by,
 			create_id
@@ -19,7 +19,7 @@
 			#{questionnaireUuid},
 			#{questionnaireName},
 			#{processStatus},
-			#{reason},
+			#{phoneNumber},
 			#{createTime},
 			#{createBy},
 			#{createId}
@@ -91,8 +91,22 @@
 	</select>
 
 	<select id="selectById" resultType="com.tiptimes.model.Record">
-		SELECT process_status AS 'processStatus',reason
+		SELECT process_status AS 'processStatus',reason,create_by AS 'createBy',
+			phone_number AS 'phoneNumber'
 		FROM t_record
 		WHERE id=#{recordId}
 	</select>
+
+	<select id="selectRecordList" resultType="com.tiptimes.model.Record">
+		SELECT process_status AS 'processStatus',reason,create_by AS 'createBy',
+			phone_number AS 'phoneNumber'
+		FROM t_record
+		WHERE questionnaire_uuid=#{questionnaireUuid}
+		<if test="createBy != null and createBy != ''">
+			AND create_by = #{createBy}
+		</if>
+		<if test="processStatus != null and processStatus != ''"><!-- 开始时间 -->
+			AND process_status #{processStatus}
+		</if>
+	</select>
 </mapper>
\ No newline at end of file