问卷调查

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.QuestionnaireResultDto;
 import com.ym.mec.biz.dal.dto.QuestionnaireUserResultDto;
+import com.ym.mec.biz.dal.enums.QuestionnaireActiveTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
 import io.swagger.models.auth.In;
@@ -22,7 +23,7 @@ public interface QuestionnaireUserResultDao extends BaseDAO<Long, QuestionnaireU
 
     void delByActiveIdAndUserId(@Param("activityId") Integer activityId,
                                 @Param("userId") Integer userId,
-                                @Param("activeType") String activeType);
+                                @Param("activeType") QuestionnaireActiveTypeEnum activeType);
 
     void batchInsert1(@Param("questionnaireUserResultList") List<QuestionnaireUserResult> questionnaireUserResultList);
 

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

@@ -84,7 +84,7 @@ public class MusicGroupQuestionnaireServiceImpl extends BaseServiceImpl<Integer,
 			result.setActiveType(QuestionnaireActiveTypeEnum.MUSIC_GROUP_QUESTION);
 		}
 		//删除原来的问卷结果
-		questionnaireUserResultDao.delByActiveIdAndUserId(musicGroupQuestionnaire.getId(), null,"MUSIC_GROUP_QUESTION");
+		questionnaireUserResultDao.delByActiveIdAndUserId(musicGroupQuestionnaire.getId(), null,QuestionnaireActiveTypeEnum.MUSIC_GROUP_QUESTION);
 		questionnaireUserResultDao.batchInsert1(questionnaireUserResultList);
 	}
 
@@ -102,7 +102,7 @@ public class MusicGroupQuestionnaireServiceImpl extends BaseServiceImpl<Integer,
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
-		questionnaireUserResultDao.delByActiveIdAndUserId(id, null,"MUSIC_GROUP_QUESTION");
+		questionnaireUserResultDao.delByActiveIdAndUserId(id, null,QuestionnaireActiveTypeEnum.MUSIC_GROUP_QUESTION);
 		musicGroupQuestionnaireDao.delete(id);
 	}
 }

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

@@ -174,17 +174,18 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 			}
 			QuestionnaireActiveTypeEnum activeType = replacementInstrumentActivity.getActiveType();
 			if(topic.getAgainCommitFlag() == 0){
-				HashMap<String, Object> paramMap = new HashMap<>(3);
+				HashMap<String, Object> paramMap = new HashMap<>(4);
 				paramMap.put("activeId",replacementInstrumentActivity.getReplacementInstrumentCooperationId());
-				paramMap.put("activeType",activeType.getCode());
+				paramMap.put("activeType",activeType);
 				paramMap.put("userId",sysUser.getId());
+				paramMap.put("topicId",topicId);
 				List<QuestionnaireUserResult> userResults = questionnaireUserResultDao.findAll(paramMap);
 				if(userResults != null && userResults.size() > 0){
 					throw new BizException("您已提交问卷，请勿重复操作");
 				}
 			}
 			//删除原来的问卷结果
-			questionnaireUserResultDao.delByActiveIdAndUserId(null, sysUser.getId(),activeType.getCode());
+			questionnaireUserResultDao.delByActiveIdAndUserId(null, sysUser.getId(),activeType);
 			for (QuestionnaireUserResult result : questionnaireUserResultList) {
 				result.setUserId(sysUser.getId());
 				result.setQuestionnaireTopicId(topicId);

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

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

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

@@ -42,8 +42,8 @@
 			<if test="activeId != null">
 				AND qur.active_id_ = #{activeId}
 			</if>
-			<if test="activeType != null and activeType != ''">
-				AND qur.active_type_ = #{activeType}
+			<if test="activeType != null">
+				AND qur.active_type_ = #{activeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 		ORDER BY su.organ_id_,qur.create_time_ DESC,qur.user_id_,qur.id_
@@ -101,13 +101,17 @@
 	</delete>
     <delete id="delByActiveIdAndUserId">
 		DELETE FROM questionnaire_user_result
-		WHERE active_type_ = #{activeType}
-		<if test="userId != null">
-		  AND user_id_ = #{userId}
-		</if>
-		<if test="activityId != null">
-		  AND active_id_ = #{activityId}
-		</if>
+		<where>
+			<if test="activeType != null">
+				AND active_type_ = #{userId,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="userId != null">
+				AND user_id_ = #{userId}
+			</if>
+			<if test="activityId != null">
+				AND active_id_ = #{activityId}
+			</if>
+		</where>
 	</delete>
 
     <!-- 分页查询 -->