Merge remote-tracking branch 'origin/2021-04-28' into 2021-04-28

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -559,7 +559,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         //获取所有问卷结果
         List<ReplacementInstrumentActivity> activities = replacementInstrumentActivityDao.findAll(new HashMap<>());
         //获取所有问题
-        List<QuestionnaireQuestion> questionList = questionnaireQuestionDao.findByTopicId(2);
+        List<QuestionnaireQuestion> questionList = questionnaireQuestionDao.findByTopicId(1);
         List<QuestionnaireUserResult> questionnaireUserResultList = new ArrayList<>();
         for (ReplacementInstrumentActivity activity : activities) {
             String questionResult = activity.getQuestionResult();

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

@@ -9,6 +9,8 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.QuestionnaireUserResult" id="QuestionnaireUserResult">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
+		<result column="username_" property="username" />
+		<result column="phone_" property="phone" />
 		<result column="active_type_" property="activeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="active_id_" property="activeId"/>
 		<result column="questionnaire_topic_id_" property="questionnaireTopicId" />

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

@@ -20,7 +20,7 @@ public class QuestionnaireUserResultController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/queryPage')")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireUserResult/queryPage')")
     public Object queryPage(QuestionnaireUserResultQueryInfo queryInfo) {
         return succeed(questionnaireUserResultService.queryDetailPage(queryInfo));
     }