调查问卷

mec-biz/src/main/java/com/ym/mec/biz/dal/page/QuestionnaireUserResultQueryInfo.java

@@ -4,13 +4,33 @@ import com.ym.mec.common.page.QueryInfo;
 
 public class QuestionnaireUserResultQueryInfo extends QueryInfo {
 
-	private Integer cooperationId;
+	private Long activeId;
 
-	public Integer getCooperationId() {
-		return cooperationId;
+	private String activeType;
+
+	private Integer topicId;
+
+	public Long getActiveId() {
+		return activeId;
+	}
+
+	public void setActiveId(Long activeId) {
+		this.activeId = activeId;
+	}
+
+	public String getActiveType() {
+		return activeType;
+	}
+
+	public void setActiveType(String activeType) {
+		this.activeType = activeType;
+	}
+
+	public Integer getTopicId() {
+		return topicId;
 	}
 
-	public void setCooperationId(Integer cooperationId) {
-		this.cooperationId = cooperationId;
+	public void setTopicId(Integer topicId) {
+		this.topicId = topicId;
 	}
 }

mec-biz/src/main/resources/config/mybatis/QuestionnaireUserResultMapper.xml

@@ -124,6 +124,15 @@
 			<if test="search != null and search != ''">
 				qu.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%')
 			</if>
+			<if test="activeId != null">
+				AND qu.active_id_ = #{activeId}
+			</if>
+			<if test="activeType != null and activeType != ''">
+				AND qu.active_type_ = #{activeType}
+			</if>
+			<if test="topicId != null">
+				AND qu.questionnaire_topic_id_ = #{topicId}
+			</if>
 		</where>
 	</sql>
 	<select id="queryDetailPage" resultMap="QuestionnaireUserResultDto">

mec-web/src/main/java/com/ym/mec/web/controller/QuestionnaireUserResultController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.page.QuestionnaireUserResultQueryInfo;
 import com.ym.mec.biz.service.QuestionnaireUserResultService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -20,7 +21,7 @@ public class QuestionnaireUserResultController extends BaseController {
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/queryPage')")
-    public Object queryPage(QueryInfo queryInfo) {
+    public Object queryPage(QuestionnaireUserResultQueryInfo queryInfo) {
         return succeed(questionnaireUserResultService.queryDetailPage(queryInfo));
     }
 }