Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/QuestionnaireResultDto.java

@@ -15,6 +15,16 @@ public class QuestionnaireResultDto{
 
     private String additionalValue;
 
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getAdditionalValue() {
         return additionalValue;
     }

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

@@ -107,7 +107,7 @@
 
     <!-- 分页查询 -->
 	<select id="findResultCount" resultMap="QuestionnaireUserResultDto" parameterType="map">
-		SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_
+		SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_,qq.type_
 		FROM (SELECT qu.user_id_ id_ FROM questionnaire_user_result qu
 		WHERE qu.questionnaire_topic_id_ = #{topicId}
 		<if test="search != null and search != ''">
@@ -159,6 +159,7 @@
 			<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
 			<result column="questionnaire_question_item_id_list_" property="questionnaireQuestionItemIdList" />
 			<result column="additional_value_" property="additionalValue" />
+			<result column="type_" property="type" />
 		</collection>
 	</resultMap>
 	<sql id="queryDetailPageSql">

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

@@ -30,7 +30,6 @@ public class QuestionnaireTopicController extends BaseController {
 
     @ApiOperation(value = "获取详情")
     @GetMapping("/getDetail")
-    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/getDetail')")
     @AuditLogAnnotation(operateName = "获取详情")
     public Object getDetail(Integer id) {
         return succeed(questionnaireTopicService.getDetail(id));

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

@@ -39,7 +39,6 @@ public class QuestionnaireUserResultController extends BaseController {
 
     @ApiOperation(value = "添加调查问卷（非活动）")
     @RequestMapping("/add")
-    @PreAuthorize("@pcs.hasPermissions('questionnaireUserResult/add')")
     public Object queryPage(@RequestBody ReplacementInstrumentActivityDto replacementInstrumentActivity) {
         questionnaireUserResultService.addResult(replacementInstrumentActivity);
         return succeed();