|
@@ -357,11 +357,11 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
|
|
if (info.getQuestionOptions() != null && !info.getQuestionOptions().isEmpty()) {
|
|
if (info.getQuestionOptions() != null && !info.getQuestionOptions().isEmpty()) {
|
|
demandSurveyUserAnswerDo.setOptions(String.join("-;-", info.getQuestionOptions()));
|
|
demandSurveyUserAnswerDo.setOptions(String.join("-;-", info.getQuestionOptions()));
|
|
}
|
|
}
|
|
- demandSurveyUserAnswerDo.setCreateuserid(currentUser.getCreateuserid());
|
|
|
|
- demandSurveyUserAnswerDo.setCreateusername(currentUser.getCreateusername());
|
|
|
|
|
|
+ demandSurveyUserAnswerDo.setCreateuserid(currentUser.getId());
|
|
|
|
+ demandSurveyUserAnswerDo.setCreateusername(currentUser.getName());
|
|
demandSurveyUserAnswerDo.setCreatedate(currentDate);
|
|
demandSurveyUserAnswerDo.setCreatedate(currentDate);
|
|
- demandSurveyUserAnswerDo.setModifyuserid(currentUser.getCreateuserid());
|
|
|
|
- demandSurveyUserAnswerDo.setModifyusername(currentUser.getCreateusername());
|
|
|
|
|
|
+ demandSurveyUserAnswerDo.setModifyuserid(currentUser.getId());
|
|
|
|
+ demandSurveyUserAnswerDo.setModifyusername(currentUser.getName());
|
|
demandSurveyUserAnswerDo.setModifydate(currentDate);
|
|
demandSurveyUserAnswerDo.setModifydate(currentDate);
|
|
demandSurveyUserAnswerDo.setDeleted("0");
|
|
demandSurveyUserAnswerDo.setDeleted("0");
|
|
demandSurveyUserAnswerDo.setTenantid(trainingDemandSurveyBackupsDo.getTenantid());
|
|
demandSurveyUserAnswerDo.setTenantid(trainingDemandSurveyBackupsDo.getTenantid());
|
|
@@ -371,7 +371,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
|
|
// 保存用户问卷结果
|
|
// 保存用户问卷结果
|
|
demandSurveyUserAnswerService.saveBatch(saveData);
|
|
demandSurveyUserAnswerService.saveBatch(saveData);
|
|
// 更新问卷调查已参与用户和未参与用户
|
|
// 更新问卷调查已参与用户和未参与用户
|
|
- trainingDemandSurveyBackupsDao.updateParticipant(currentUser.getCreateuserid(), currentUser.getCreateusername(), surverid);
|
|
|
|
|
|
+ trainingDemandSurveyBackupsDao.updateParticipant(currentUser.getId(), currentUser.getName(), surverid);
|
|
return R.ok();
|
|
return R.ok();
|
|
}
|
|
}
|
|
|
|
|