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

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;
+    }
+}

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/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);
 }

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);
+	}
 }

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

@@ -151,8 +151,6 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         return replacementInstrumentActivity;
     }
 
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object apply(ReplacementInstrumentActivityDto replacementInstrumentActivity) {
@@ -205,6 +203,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             for (QuestionnaireUserResult result : questionnaireUserResultList) {
                 result.setUserId(sysUser.getId());
                 result.setQuestionnaireTopicId(topicId);
+                result.setActiveId(replacementInstrumentActivity.getReplacementInstrumentCooperationId());
                 result.setActiveType(QuestionnaireActiveTypeEnum.REPLACEMENT);
             }
             //新增问卷结果
@@ -574,7 +573,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
                 //获取问题答案
                 QuestionnaireQuestionItem item = questionnaireQuestionItemDao.findByQuestionId(question.getId());
                 result.setUserId(activity.getUserId());
-                result.setActiveId(activity.getId());
+                result.setActiveId(activity.getReplacementInstrumentCooperationId());
                 result.setActiveType(QuestionnaireActiveTypeEnum.REPLACEMENT);
                 result.setQuestionnaireQuestionId(question.getId());
                 result.setQuestionnaireQuestionItemIdList(item.getId() + (Integer.parseInt(split[i]) == 0?1:0) + "");

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}

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-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -18,10 +18,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("replacementInstrumentActivity")
 @Api(tags = "乐器置换调查问卷")
@@ -43,7 +40,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
     @ApiOperation(value = "新版新增调查问卷")
     @PostMapping("/apply")
-    public Object apply(ReplacementInstrumentActivityDto replacementInstrumentActivityDto) {
+    public Object apply(@RequestBody ReplacementInstrumentActivityDto replacementInstrumentActivityDto) {
         return succeed(replacementInstrumentActivityService.apply(replacementInstrumentActivityDto));
     }
 
@@ -120,7 +117,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
     @ApiOperation(value = "新版获取置换的详情")
     @GetMapping("/getInfoByCooperationId")
-    @ApiImplicitParams({@ApiImplicitParam(name = "getInfoByCooperationId", value = "置换活动编号", required = true, dataType = "int")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "cooperationId", value = "置换活动编号", required = true, dataType = "int")})
     public HttpResponseResult<ReplacementInstrumentActivityStatDto> getInfoByCooperationId(Integer cooperationId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -129,7 +126,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
         ReplacementInstrumentCooperation replacementInstrumentCooperation = replacementInstrumentCooperationService.get(cooperationId);
         ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityService.findByUserId(replacementInstrumentCooperation.getCooperationOrganId(),
                 sysUser.getId(),
-                replacementInstrumentCooperation.getTopicId());
+                replacementInstrumentCooperation.getId());
         if(replacementInstrumentActivity == null){
         	return failed("未查询到您参与调查的记录");
         }

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

@@ -0,0 +1,25 @@
+package com.ym.mec.web.controller;
+
+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("questionnaireQuestion")
+@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));
+    }
+}

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));
     }
 }