问卷调查

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

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

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

@@ -235,8 +235,13 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             replacementInstrumentActivityDao.update(replacementInstrumentActivity);
 
             if (questionnaireUserResultList != null && questionnaireUserResultList.size() > 0) {
+                HashMap<String, Object> paramMap = new HashMap<>(4);
+                paramMap.put("activeId",activity.getReplacementInstrumentCooperationId());
+                paramMap.put("activeType",QuestionnaireActiveTypeEnum.REPLACEMENT);
+                paramMap.put("userId",sysUser.getId());
+                paramMap.put("topicId",topicId);
                 //删除原来的问卷结果
-                questionnaireUserResultDao.delByActiveIdAndUserId(activity.getReplacementInstrumentCooperationId(), sysUser.getId(),QuestionnaireActiveTypeEnum.REPLACEMENT);
+                questionnaireUserResultDao.delByActiveIdAndUserId(paramMap);
             }
             if (replacementInstrumentActivity.getInstrumentsId() != null && (activity.getInstrumentsId() == null || activity.getInstrumentsId() == 0)) {
                 sendPush = true;