zouxuan 4 роки тому
батько
коміт
9e5ba03594

+ 16 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/QuestionnaireQuestionQueryInfo.java

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class QuestionnaireQuestionQueryInfo extends QueryInfo {
+
+    private Integer topicId;
+
+    public Integer getTopicId() {
+        return topicId;
+    }
+
+    public void setTopicId(Integer topicId) {
+        this.topicId = topicId;
+    }
+}

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/QuestionnaireQuestionService.java

@@ -3,6 +3,9 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.QuestionnaireQuestion;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface QuestionnaireQuestionService extends BaseService<Long, QuestionnaireQuestion> {
 
+    List<QuestionnaireQuestion> findByTopicId(Integer topicId);
 }

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireQuestionServiceImpl.java

@@ -8,6 +8,8 @@ import com.ym.mec.biz.service.QuestionnaireQuestionService;
 import com.ym.mec.biz.dal.dao.QuestionnaireQuestionDao;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class QuestionnaireQuestionServiceImpl extends BaseServiceImpl<Long, QuestionnaireQuestion>  implements QuestionnaireQuestionService {
 	
@@ -18,4 +20,9 @@ public class QuestionnaireQuestionServiceImpl extends BaseServiceImpl<Long, Ques
 	public BaseDAO<Long, QuestionnaireQuestion> getDAO() {
 		return questionnaireQuestionDao;
 	}
+
+	@Override
+	public List<QuestionnaireQuestion> findByTopicId(Integer topicId) {
+		return questionnaireQuestionDao.findByTopicId(topicId);
+	}
 }

+ 12 - 1
mec-biz/src/main/resources/config/mybatis/QuestionnaireQuestionMapper.xml

@@ -90,14 +90,25 @@
 		</foreach>
 	</delete>
 
+	<sql id="queryPageSql">
+		<where>
+			<if test="topicId != null">
+				AND questionnaire_topic_id_ = #{topicId}
+			</if>
+		</where>
+	</sql>
     <!-- 分页查询 -->
 	<select id="queryPage" resultMap="QuestionnaireQuestion" parameterType="map">
-		SELECT * FROM questionnaire_question ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM questionnaire_question
+		<include refid="queryPageSql"/>
+		ORDER BY id_
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM questionnaire_question
+		<include refid="queryPageSql"/>
 	</select>
     <select id="findByTopicId" resultMap="QuestionnaireQuestion">
 		SELECT * FROM questionnaire_question WHERE questionnaire_topic_id_ = #{topicId}

+ 26 - 0
mec-web/src/main/java/com/ym/mec/web/controller/QuestionnaireQuestionController.java

@@ -0,0 +1,26 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.QuestionnaireQuestionQueryInfo;
+import com.ym.mec.biz.service.QuestionnaireQuestionService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("questionnaireTopic")
+@Api(tags = "问题")
+@RestController
+public class QuestionnaireQuestionController extends BaseController {
+
+    @Autowired
+    private QuestionnaireQuestionService questionnaireQuestionService;
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireQuestion/queryPage')")
+    public Object queryPage(Integer topicId) {
+        return succeed(questionnaireQuestionService.findByTopicId(topicId));
+    }
+}