|
|
@@ -74,7 +74,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
|
|
|
TrainingDemandSurveyDo trainingDemandSurveyDo = trainingDemandSurveyDao.selectById(id);
|
|
|
if (trainingDemandSurveyDo == null) {
|
|
|
log.error("无法通过id：{},获取到培训需求调查信息", trainingDemandSurveyDo);
|
|
|
- return R.error(ERROR_MSG);
|
|
|
+ return R.error(String.format("%s元应为:%s", ERROR_MSG, "无法获取到问卷调查信息"));
|
|
|
}
|
|
|
if (RELEASE.equals(trainingDemandSurveyDo.getState())) {
|
|
|
log.error("调查问卷 ：{}已发布无法再次发布", trainingDemandSurveyDo.getName());
|
|
|
@@ -83,10 +83,10 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
|
|
|
List<DemandSurveyContentDo> saveDemandSurveyContentDos = new ArrayList<>();
|
|
|
/******************************获取参与此次问卷的用户信息*********************************************/
|
|
|
Set<String> participantUserId = getParticipantUser(trainingDemandSurveyDo);
|
|
|
- log.info("参与本次温泉调查的员工数为:{}", participantUserId.size());
|
|
|
+ log.info("参与本次问卷调查的员工数为:{}", participantUserId.size());
|
|
|
if (participantUserId.size() == 0) {
|
|
|
log.error("本次问卷调查参与人数为0");
|
|
|
- return R.error(ERROR_MSG);
|
|
|
+ return R.error(String.format("%s元应为:%s", ERROR_MSG, "暂无问卷参与人"));
|
|
|
}
|
|
|
/******************************开始复制业务数据*********************************************/
|
|
|
// 调查问卷自定义信息
|
|
|
@@ -282,7 +282,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
|
|
|
}
|
|
|
// 参与培训的员工
|
|
|
String participateuserid = trainingDemandSurveyDo.getParticipateuserid();
|
|
|
- if (StringUtils.isNotBlank(participatedeptid)) {
|
|
|
+ if (StringUtils.isNotBlank(participateuserid)) {
|
|
|
participantUserIdList.addAll(Arrays.asList(participateuserid.split(",")));
|
|
|
}
|
|
|
// 排除的员工
|
xiahan