feature 代码提交

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingDemandServiceImpl.java

@@ -86,7 +86,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         TrainingDemandSurveyDo trainingDemandSurveyDo = trainingDemandSurveyDao.selectById(id);
         if (trainingDemandSurveyDo == null) {
             log.error("无法通过id：{},获取到培训需求调查信息", trainingDemandSurveyDo);
-            return R.error(String.format("%s元应为:%s", ERROR_MSG, "无法获取到问卷调查信息"));
+            return R.error(String.format("%s原因为:%s", ERROR_MSG, "无法获取到问卷调查信息"));
         }
         if (RELEASE.equals(trainingDemandSurveyDo.getState())) {
             log.error("调查问卷 ：{}已发布无法再次发布", trainingDemandSurveyDo.getName());
@@ -98,7 +98,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         log.info("参与本次问卷调查的员工数为:{}", participantUserId.size());
         if (participantUserId.size() == 0) {
             log.error("本次问卷调查参与人数为0");
-            return R.error(String.format("%s元应为:%s", ERROR_MSG, "暂无问卷参与人"));
+            return R.error(String.format("%s原因为:%s", ERROR_MSG, "暂无问卷参与人"));
         }
         /******************************开始复制业务数据*********************************************/
         // 调查问卷自定义信息
@@ -113,7 +113,9 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         }
         // 模板信息
         List<TrainingDemandTempDo> trainingDemandTempDos = trainingDemandTempDao.selectList(new LambdaQueryWrapper<TrainingDemandTempDo>()
-                .in(TrainingDemandTempDo::getId, surveyTempDetailDos.stream().map(TrainingDemandSurveyTempDetailDo::getTempid).collect(Collectors.toList())));
+                .in(TrainingDemandTempDo::getId, surveyTempDetailDos.stream()
+                        .map(TrainingDemandSurveyTempDetailDo::getTempid)
+                        .collect(Collectors.toList())));
         // 模板子表
         List<TrainingDemandTempDetailDo> trainingDemandTempDetailDos = trainingDemandTempDetailDao.selectList(
                 new LambdaQueryWrapper<TrainingDemandTempDetailDo>()
@@ -241,8 +243,9 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         List<TrainingDemandVo> trainingDemandVoList = new ArrayList<>();
         int num = 1;
         // 问题模板
-        for (int i = 0; i < trainingDemandTempDos.size(); i++) {
-            TrainingDemandTempDo trainingDemandTempDo = trainingDemandTempDos.get(i);
+        for (int i = 0; i < tempIdList.size(); i++) {
+            int finalI = i;
+            TrainingDemandTempDo trainingDemandTempDo = trainingDemandTempDos.stream().filter(info->info.getId().equals(tempIdList.get(finalI))).findFirst().get();
             // 当前模板拥有的问题
             List<TrainingDemandTempDetailDo> currentTempQuestion = trainingDemandTempDetailDos.stream()
                     .filter(info -> info.getDemandtempid().equals(trainingDemandTempDo.getId())).collect(Collectors.toList());