调查问卷

mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentActivityService.java

@@ -16,7 +16,7 @@ public interface ReplacementInstrumentActivityService extends BaseService<Intege
 
     Object add(ReplacementInstrumentActivity replacementInstrumentActivity);
 
-    ReplacementInstrumentActivity findByUserId(Integer cooperationOrganId, Integer userId,Integer topicId);
+    ReplacementInstrumentActivity findByUserId(Integer cooperationOrganId, Integer userId,Integer cooperationId);
 
     PageInfo<ReplacementInstrumentActivityStatDto> queryReplacementsStat(ReplacementInstrumentActivityQueryInfo queryInfo);
 

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

@@ -158,7 +158,9 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         Integer topicId = replacementInstrumentActivity.getTopicId();
         ReplacementInstrumentCooperation replacementInstrumentCooperation = replacementInstrumentCooperationDao.get(replacementInstrumentActivity.getReplacementInstrumentCooperationId());
         //如果提交过调查问卷，那么覆盖之前的记录
-        ReplacementInstrumentActivity activity = replacementInstrumentActivityDao.findByUserId(replacementInstrumentActivity.getCooperationOrganId(), sysUser.getId(),replacementInstrumentCooperation.getId());
+        ReplacementInstrumentActivity activity = replacementInstrumentActivityDao.findByUserId(replacementInstrumentActivity.getCooperationOrganId(),
+                sysUser.getId(),
+                replacementInstrumentCooperation.getId());
         if (replacementInstrumentCooperation != null && replacementInstrumentCooperation.getOpenPay().equals(YesOrNoEnum.YES)) {
             replacementInstrumentActivity.setOpenFlag(1);
         }
@@ -184,10 +186,13 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             sendPush = true;
         }
         if(questionnaireUserResultList != null && questionnaireUserResultList.size() > 0){
+            for (QuestionnaireUserResult result : questionnaireUserResultList) {
+                result.setUserId(sysUser.getId());
+                result.setQuestionnaireTopicId(topicId);
+                result.setActiveType(QuestionnaireActiveTypeEnum.REPLACEMENT);
+            }
             //新增问卷结果
-            questionnaireUserResultDao.batchInsert(questionnaireUserResultList,
-                    QuestionnaireActiveTypeEnum.REPLACEMENT.getCode(),
-                    topicId,activity.getId());
+            questionnaireUserResultDao.batchInsert1(questionnaireUserResultList);
         }
         //已开启缴费推送购买链接
         if (sendPush && replacementInstrumentActivity.getOpenFlag().equals(1) && replacementInstrumentActivity.getInstrumentsId() != null) {

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

@@ -19,12 +19,4 @@ public class QuestionnaireUserResultController extends BaseController {
     @Autowired
     private QuestionnaireUserResultService questionnaireUserResultService;
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    @PreAuthorize("@pcs.hasPermissions('questionnaireUserResult/add')")
-    @AuditLogAnnotation(operateName = "新增")
-    public Object add(@RequestBody List<QuestionnaireUserResult> questionnaireUserResultList) {
-        questionnaireUserResultService.batchInsert(questionnaireUserResultList);
-        return succeed();
-    }
 }

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -47,7 +47,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
         return succeed(replacementInstrumentActivityService.apply(replacementInstrumentActivityDto));
     }
 
-    @ApiOperation(value = "获取学员基本信息")
+    @ApiOperation(value = "新版获取学员基本信息")
     @GetMapping("queryUserInfoByCooperationId")
     public Object queryUserInfoByCooperationId(Integer cooperationId) {
         SysUser user = sysUserFeignService.queryUserInfo();
@@ -118,7 +118,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
         return succeed(replacementInstrumentActivityService.getInfo(activityId));
     }
 
-    @ApiOperation(value = "获取置换的详情")
+    @ApiOperation(value = "新版获取置换的详情")
     @GetMapping("/getInfoByCooperationId")
     @ApiImplicitParams({@ApiImplicitParam(name = "getInfoByCooperationId", value = "置换活动编号", required = true, dataType = "int")})
     public HttpResponseResult<ReplacementInstrumentActivityStatDto> getInfoByCooperationId(Integer cooperationId) {