-导师带徒bugfix

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFirstplanController.java

@@ -113,7 +113,7 @@ public class TTsFirstplanController extends BaseController {
                 need.setTimer(timer + 1);
                 if (need.getTimerNeed() == null)
                     need.setTimerNeed(0.0);
-                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1&&need.getPlanStatus()==0) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1 && need.getPlanStatus() == 0) {
                     need.setPlanStatus(2L);
                 }
             }
@@ -129,6 +129,14 @@ public class TTsFirstplanController extends BaseController {
     @Log(title = "进组培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFirstplan tTsFirstplan) {
+        TTsFirstplan firstplan = tTsFirstplanService.selectTTsFirstplanById(tTsFirstplan.getId());
+        if ((StringUtils.isNotEmpty(tTsFirstplan.getScore1()) && StringUtils.isEmpty(firstplan.getScore1())) ||
+                (StringUtils.isNotEmpty(tTsFirstplan.getScore2()) && StringUtils.isEmpty(firstplan.getScore2())) ||
+                (StringUtils.isNotEmpty(tTsFirstplan.getScore3()) && StringUtils.isEmpty(firstplan.getScore3()))) {
+            if (StringUtils.isEmpty(firstplan.getTrainer()) || !firstplan.getTrainer().trim().equals(getNickName())) {
+                return AjaxResult.error("仅讲师可评估成绩！");
+            }
+        }
         tTsFirstplan.setUserId(getUserId());
         tTsFirstplan.setNickName(getNickName());
         if ("1".equals(tTsFirstplan.getTrainerConfirm())) {
@@ -138,7 +146,6 @@ public class TTsFirstplanController extends BaseController {
             tTsFirstplan.setStudentConfirm(getNickName());
             tTsFirstplan.setTrainingPlanDate(new Date());
             tTsFirstplan.setCourseDate(new Date());
-            TTsFirstplan firstplan = tTsFirstplanService.selectTTsFirstplanById(tTsFirstplan.getId());
             tTsFirstplan.setAssess(StringUtils.isEmpty(firstplan.getScore2()) ? firstplan.getScore1() : firstplan.getScore2());
         }
         return toAjax(tTsFirstplanService.updateTTsFirstplan(tTsFirstplan));