培训/演练 提示信息修改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -384,15 +384,15 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         if (ObjectUtil.isEmpty(request.getRemark())) {
             request.setRemark(null);
         }
-        validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "当前状态仅允许修改任务名称");
-        validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), "当前状态仅允许修改任务名称");
+        validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "当前状态仅允许修改任务名称与机构信息");
+        validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), "当前状态仅允许修改任务名称与机构信息");
         if (ObjectUtil.equal(request.getPlanStatus(), DrillPlanStatus.USING.getCode())){
-            validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "当前状态仅允许修改任务名称");
+            validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "当前状态仅允许修改任务名称与机构信息");
         }
        /* List<Long> execOrgIdList = coreDrillPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
         validateListForStandard(execOrgIdList, request.getPlanExecOrgIdList(), "当前状态仅允许修改任务名称");*/
-        validateFieldForStandard(request.getRemark(), plan.getRemark(), "当前状态仅允许修改任务名称");
-        validateFileListForStandard(request.getFileList(), JSON.parseArray(plan.getFileList(), String.class), "当前状态仅允许修改任务名称");
+        validateFieldForStandard(request.getRemark(), plan.getRemark(), "当前状态仅允许修改任务名称与机构信息");
+        validateFileListForStandard(request.getFileList(), JSON.parseArray(plan.getFileList(), String.class), "当前状态仅允许修改任务名称与机构信息");
         plan.setPlanName(request.getPlanName());
         if (ObjectUtil.equal(request.getPlanStatus(), DrillPlanStatus.DELETED.getCode())){
             plan.setExecOrgType(request.getExecOrgType());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -348,14 +348,14 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             request.setRemark(null);
         }
         validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "当前状态仅允许修改任务名称与机构信息");
-        validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), "当前状态仅允许修改任务名称");
+        validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), "当前状态仅允许修改任务名称与机构信息");
         if (ObjectUtil.equal(plan.getPlanStatus(), DrillPlanStatus.USING.getCode())){
-            validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "当前状态仅允许修改任务名称");
+            validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "当前状态仅允许修改任务名称与机构信息");
         }
         /*List<Long> execOrgIdList = coreEduTrainingPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
         validateListForStandard(execOrgIdList, request.getPlanExecOrgIdList(), "当前状态仅允许修改任务名称");*/
-        validateFieldForStandard(request.getRemark(), plan.getRemark(), "当前状态仅允许修改任务名称");
-        validateFileListForStandard(request.getFileList(), JSON.parseArray(plan.getFileList(), String.class), "当前状态仅允许修改任务名称");
+        validateFieldForStandard(request.getRemark(), plan.getRemark(), "当前状态仅允许修改任务名称与机构信息");
+        validateFileListForStandard(request.getFileList(), JSON.parseArray(plan.getFileList(), String.class), "当前状态仅允许修改任务名称与机构信息");
         plan.setPlanName(request.getPlanName());
         plan.setExecOrgType(request.getExecOrgType());
         if (plan.getPlanStatus() == EduTrainingPlanStatus.DELETED.getCode()) {