调查问卷

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireUserResultDao.java

@@ -20,11 +20,6 @@ public interface QuestionnaireUserResultDao extends BaseDAO<Long, QuestionnaireU
 
     void delByActiveIdAndUserId(@Param("activityId") Integer activityId, @Param("userId") Integer userId);
 
-    void batchInsert(@Param("questionnaireUserResultList") List<QuestionnaireUserResult> questionnaireUserResultList,
-                     @Param("activeType") String activeType,
-                     @Param("topicId") Integer topicId,
-                     @Param("activeId") Integer activeId);
-
     void batchInsert1(@Param("questionnaireUserResultList") List<QuestionnaireUserResult> questionnaireUserResultList);
 
     int findDetailCount(Map<String, Object> params);

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

@@ -1,6 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
 public class QuestionnaireResultDto{
+    private Long userResultId;
+
+    private String questionnaireQuestionItemIdList;
+
+    private Long questionnaireQuestionId;
 
     //问题
     private String content;
@@ -8,6 +13,30 @@ public class QuestionnaireResultDto{
     //答案
     private String answerValue;
 
+    public Long getQuestionnaireQuestionId() {
+        return questionnaireQuestionId;
+    }
+
+    public void setQuestionnaireQuestionId(Long questionnaireQuestionId) {
+        this.questionnaireQuestionId = questionnaireQuestionId;
+    }
+
+    public Long getUserResultId() {
+        return userResultId;
+    }
+
+    public void setUserResultId(Long userResultId) {
+        this.userResultId = userResultId;
+    }
+
+    public String getQuestionnaireQuestionItemIdList() {
+        return questionnaireQuestionItemIdList;
+    }
+
+    public void setQuestionnaireQuestionItemIdList(String questionnaireQuestionItemIdList) {
+        this.questionnaireQuestionItemIdList = questionnaireQuestionItemIdList;
+    }
+
     public String getContent() {
         return content;
     }

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

@@ -1,10 +1,80 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
+import com.ym.mec.biz.dal.enums.QuestionnaireActiveTypeEnum;
 
 import java.util.List;
 
-public class QuestionnaireUserResultDto extends QuestionnaireUserResult{
+public class QuestionnaireUserResultDto{
+
+    private Integer userId;
+
+    private String username;
+
+    private String phone;
+
+    private QuestionnaireActiveTypeEnum activeType;
+
+    private Integer activeId;
+
+    private Integer questionnaireTopicId;
+
+    private String additionalValue;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public QuestionnaireActiveTypeEnum getActiveType() {
+        return activeType;
+    }
+
+    public void setActiveType(QuestionnaireActiveTypeEnum activeType) {
+        this.activeType = activeType;
+    }
+
+    public Integer getActiveId() {
+        return activeId;
+    }
+
+    public void setActiveId(Integer activeId) {
+        this.activeId = activeId;
+    }
+
+    public Integer getQuestionnaireTopicId() {
+        return questionnaireTopicId;
+    }
+
+    public void setQuestionnaireTopicId(Integer questionnaireTopicId) {
+        this.questionnaireTopicId = questionnaireTopicId;
+    }
+
+    public String getAdditionalValue() {
+        return additionalValue;
+    }
+
+    public void setAdditionalValue(String additionalValue) {
+        this.additionalValue = additionalValue;
+    }
 
     private List<QuestionnaireResultDto> questionnaireResultDtoList;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherAttendance.java

@@ -76,7 +76,7 @@ public class TeacherAttendance {
 
 	private Integer update;
 
-	private int isComplaints;
+	private Integer isComplaints;
 
 	//申述状态0拒绝1通过2待处理3已撤销
 	private ComplaintsStatusEnum complaintsStatus;
@@ -201,7 +201,7 @@ public class TeacherAttendance {
 		this.operator = operator;
 	}
 
-	public int getIsComplaints() {
+	public Integer getIsComplaints() {
 		return isComplaints;
 	}
 

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

@@ -190,7 +190,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 
             if(questionnaireUserResultList != null && questionnaireUserResultList.size() > 0){
                 //删除原来的问卷结果
-                questionnaireUserResultDao.delByActiveIdAndUserId(activity.getId(),sysUser.getId());
+                questionnaireUserResultDao.delByActiveIdAndUserId(activity.getReplacementInstrumentCooperationId(),sysUser.getId());
             }
             if (replacementInstrumentActivity.getInstrumentsId() != null && (activity.getInstrumentsId() == null || activity.getInstrumentsId() == 0)) {
                 sendPush = true;

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

@@ -39,16 +39,6 @@
 			  ,#{activeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{activeId},NOW(),NOW())
 	</insert>
 
-	<insert id="batchInsert">
-		INSERT INTO questionnaire_user_result (user_id_,questionnaire_topic_id_,questionnaire_question_id_,
-		questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_)
-		VALUES
-		<foreach collection="questionnaireUserResultList" item="item" separator=",">
-			(#{item.userId},#{topicId},#{item.questionnaireQuestionId},#{item.questionnaireQuestionItemIdList},#{item.additionalValue}
-			,#{activeType},#{activeId},NOW(),NOW())
-		</foreach>
-	</insert>
-
 	<insert id="batchInsert1">
 		INSERT INTO questionnaire_user_result (user_id_,questionnaire_topic_id_,questionnaire_question_id_,
 		questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_)
@@ -110,15 +100,24 @@
 		SELECT COUNT(id_) FROM questionnaire_user_result WHERE questionnaire_topic_id_ = #{topicId}
 	</select>
 	<select id="findDetailCount" resultType="java.lang.Integer">
-		SELECT COUNT(qu.id_) FROM questionnaire_user_result qu
+		SELECT COUNT(DISTINCT su.id_) FROM questionnaire_user_result qu
 		LEFT JOIN sys_user su ON su.id_ = qu.user_id_
 		<include refid="queryDetailPageSql"/>
-		<include refid="global.limit"/>
 	</select>
-	<resultMap type="com.ym.mec.biz.dal.dto.QuestionnaireUserResultDto" id="QuestionnaireUserResultDto" extends="QuestionnaireUserResult">
+	<resultMap type="com.ym.mec.biz.dal.dto.QuestionnaireUserResultDto" id="QuestionnaireUserResultDto">
+		<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" />
+		<result column="additional_value_" property="additionalValue" />
 		<collection property="questionnaireResultDtoList" ofType="com.ym.mec.biz.dal.dto.QuestionnaireResultDto">
+			<result column="id_" property="userResultId" />
 			<result property="content" column="content_"/>
 			<result property="answerValue" column="answer_value_"/>
+			<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
+			<result column="questionnaire_question_item_id_list_" property="questionnaireQuestionItemIdList" />
 		</collection>
 	</resultMap>
 	<sql id="queryDetailPageSql">
@@ -138,14 +137,16 @@
 		</where>
 	</sql>
 	<select id="queryDetailPage" resultMap="QuestionnaireUserResultDto">
-		SELECT qur.*,qq.content_,qqi.answer_value_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_),qur.additional_value_
-		FROM (SELECT qu.*,su.username_,su.phone_ FROM questionnaire_user_result qu
+		SELECT qu1.*,qur.username_,qur.phone_,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_
+		FROM (SELECT su.id_,su.username_,su.phone_ FROM questionnaire_user_result qu
 		LEFT JOIN sys_user su ON su.id_ = qu.user_id_
 		<include refid="queryDetailPageSql"/>
+		GROUP BY su.id_
 		<include refid="global.limit"/>) qur
-		LEFT JOIN questionnaire_question qq ON qq.id_ = qur.questionnaire_question_id_
-		LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qur.questionnaire_question_item_id_list_)
-		GROUP BY qur.user_id_,qq.id_
-		ORDER BY qur.user_id_
+		LEFT JOIN questionnaire_user_result qu1 ON qur.id_ = qu1.user_id_
+		LEFT JOIN questionnaire_question qq ON qq.id_ = qu1.questionnaire_question_id_
+		LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qu1.questionnaire_question_item_id_list_)
+		GROUP BY qq.id_
+		ORDER BY qu1.user_id_
 	</select>
 </mapper>