修改导师带徒

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

@@ -176,28 +176,29 @@ public class TTsFlplanController extends BaseController {
                 }
             }
         }
+        TTsFlplan flplan = tTsFlplanService.selectTTsFlplanById(tTsFlplan.getId());
         if ("好".equals(tTsFlplan.getScore1())) {
             tTsFlplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
+        if (("满意".equals(tTsFlplan.getScore1())||"满意".equals(flplan.getScore1())) && "好".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore3())) {
+        if (("满意".equals(tTsFlplan.getScore1())||"满意".equals(flplan.getScore1())) && ("满意".equals(tTsFlplan.getScore2())||"满意".equals(flplan.getScore2())) && "好".equals(tTsFlplan.getScore3())) {
             tTsFlplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore2())) {
+        if (("满意".equals(tTsFlplan.getScore1())||"满意".equals(flplan.getScore1())) && ("差".equals(tTsFlplan.getScore2())||"差".equals(flplan.getScore2())) && "好".equals(tTsFlplan.getScore3())) {
             tTsFlplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2()) && "差".equals(tTsFlplan.getScore3())) {
+        if (("满意".equals(tTsFlplan.getScore1())||"满意".equals(flplan.getScore1())) && ("满意".equals(tTsFlplan.getScore2())||"满意".equals(flplan.getScore2())) && "差".equals(tTsFlplan.getScore3())) {
             tTsFlplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
+        if (("差".equals(tTsFlplan.getScore1())||"差".equals(flplan.getScore1())) && "好".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(5L);
         }
-        if ("差".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2())) {
+        if (("差".equals(tTsFlplan.getScore1())||"差".equals(flplan.getScore1())) && "满意".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2())) {
+        if (("差".equals(tTsFlplan.getScore1())||"差".equals(flplan.getScore1())) && "差".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(4L);
         }
         tTsFlplanService.updateTTsFlplan(tTsFlplan);

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

@@ -175,28 +175,29 @@ public class TTsFtplanController extends BaseController {
                 }
             }
         }
+        TTsFtplan ftplan = tTsFtplanService.selectTTsFtplanById(tTsFtplan.getId());
         if ("好".equals(tTsFtplan.getScore1())) {
             tTsFtplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFtplan.getScore1()) && "好".equals(tTsFtplan.getScore2())) {
+        if (("满意".equals(tTsFtplan.getScore1())||"满意".equals(ftplan.getScore1())) && "好".equals(tTsFtplan.getScore2())) {
             tTsFtplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFtplan.getScore1()) && "满意".equals(tTsFtplan.getScore2()) && "好".equals(tTsFtplan.getScore3())) {
+        if (("满意".equals(tTsFtplan.getScore1())||"满意".equals(ftplan.getScore1())) && ("满意".equals(tTsFtplan.getScore2())||"满意".equals(ftplan.getScore2())) && "好".equals(tTsFtplan.getScore3())) {
             tTsFtplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFtplan.getScore1()) && "差".equals(tTsFtplan.getScore2()) && "好".equals(tTsFtplan.getScore2())) {
+        if (("满意".equals(tTsFtplan.getScore1())||"满意".equals(ftplan.getScore1())) && ("差".equals(tTsFtplan.getScore2())||"差".equals(ftplan.getScore2())) && "好".equals(tTsFtplan.getScore3())) {
             tTsFtplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsFtplan.getScore1()) && "满意".equals(tTsFtplan.getScore2()) && "差".equals(tTsFtplan.getScore3())) {
+        if (("满意".equals(tTsFtplan.getScore1())||"满意".equals(ftplan.getScore1())) && ("满意".equals(tTsFtplan.getScore2())||"满意".equals(ftplan.getScore2())) && "差".equals(tTsFtplan.getScore3())) {
             tTsFtplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsFtplan.getScore1()) && "好".equals(tTsFtplan.getScore2())) {
+        if (("差".equals(tTsFtplan.getScore1())||"差".equals(ftplan.getScore1())) && "好".equals(tTsFtplan.getScore2())) {
             tTsFtplan.setPlanStatus(5L);
         }
-        if ("差".equals(tTsFtplan.getScore1()) && "满意".equals(tTsFtplan.getScore2())) {
+        if (("差".equals(tTsFtplan.getScore1())||"差".equals(ftplan.getScore1())) && "满意".equals(tTsFtplan.getScore2())) {
             tTsFtplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsFtplan.getScore1()) && "差".equals(tTsFtplan.getScore2())) {
+        if (("差".equals(tTsFtplan.getScore1())||"差".equals(ftplan.getScore1())) && "差".equals(tTsFtplan.getScore2())) {
             tTsFtplan.setPlanStatus(4L);
         }
         tTsFtplanService.updateTTsFtplan(tTsFtplan);

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

@@ -8,6 +8,7 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
 import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
 import com.ruoyi.project.training.bccnew.domain.TTsLjplanContent;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
@@ -181,28 +182,29 @@ public class TTsLjplanController extends BaseController {
                 }
             }
         }
+        TTsLjplan ljplan = tTsLjplanService.selectTTsLjplanById(tTsLjplan.getId());
         if ("好".equals(tTsLjplan.getScore1())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsLjplan.getScore1()) && "好".equals(tTsLjplan.getScore2())) {
+        if (("满意".equals(tTsLjplan.getScore1())||"满意".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsLjplan.getScore1()) && "满意".equals(tTsLjplan.getScore2()) && "好".equals(tTsLjplan.getScore3())) {
+        if (("满意".equals(tTsLjplan.getScore1())||"满意".equals(ljplan.getScore1())) && ("满意".equals(tTsLjplan.getScore2())||"满意".equals(ljplan.getScore2())) && "好".equals(tTsLjplan.getScore3())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsLjplan.getScore1()) && "差".equals(tTsLjplan.getScore2()) && "好".equals(tTsLjplan.getScore2())) {
+        if (("满意".equals(tTsLjplan.getScore1())||"满意".equals(ljplan.getScore1())) && ("差".equals(tTsLjplan.getScore2())||"差".equals(ljplan.getScore2())) && "好".equals(tTsLjplan.getScore3())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsLjplan.getScore1()) && "满意".equals(tTsLjplan.getScore2()) && "差".equals(tTsLjplan.getScore3())) {
+        if (("满意".equals(tTsLjplan.getScore1())||"满意".equals(ljplan.getScore1())) && ("满意".equals(tTsLjplan.getScore2())||"满意".equals(ljplan.getScore2())) && "差".equals(tTsLjplan.getScore3())) {
             tTsLjplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsLjplan.getScore1()) && "好".equals(tTsLjplan.getScore2())) {
+        if (("差".equals(tTsLjplan.getScore1())||"差".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if ("差".equals(tTsLjplan.getScore1()) && "满意".equals(tTsLjplan.getScore2())) {
+        if (("差".equals(tTsLjplan.getScore1())||"差".equals(ljplan.getScore1())) && "满意".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsLjplan.getScore1()) && "差".equals(tTsLjplan.getScore2())) {
+        if (("差".equals(tTsLjplan.getScore1())||"差".equals(ljplan.getScore1())) && "差".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(4L);
         }
         tTsLjplanService.updateTTsLjplan(tTsLjplan);

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

@@ -176,28 +176,29 @@ public class TTsYsplanController extends BaseController {
                 }
             }
         }
+        TTsYsplan ysplan = tTsYsplanService.selectTTsYsplanById(tTsYsplan.getId());
         if ("好".equals(tTsYsplan.getScore1())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsYsplan.getScore1()) && "好".equals(tTsYsplan.getScore2())) {
+        if (("满意".equals(tTsYsplan.getScore1())||"满意".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsYsplan.getScore1()) && "满意".equals(tTsYsplan.getScore2()) && "好".equals(tTsYsplan.getScore3())) {
+        if (("满意".equals(tTsYsplan.getScore1())||"满意".equals(ysplan.getScore1())) && ("满意".equals(tTsYsplan.getScore2())||"满意".equals(ysplan.getScore2())) && "好".equals(tTsYsplan.getScore3())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsYsplan.getScore1()) && "差".equals(tTsYsplan.getScore2()) && "好".equals(tTsYsplan.getScore2())) {
+        if (("满意".equals(tTsYsplan.getScore1())||"满意".equals(ysplan.getScore1())) && ("差".equals(tTsYsplan.getScore2())||"差".equals(ysplan.getScore2())) && "好".equals(tTsYsplan.getScore3())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if ("满意".equals(tTsYsplan.getScore1()) && "满意".equals(tTsYsplan.getScore2()) && "差".equals(tTsYsplan.getScore3())) {
+        if (("满意".equals(tTsYsplan.getScore1())||"满意".equals(ysplan.getScore1())) && ("满意".equals(tTsYsplan.getScore2())||"满意".equals(ysplan.getScore2())) && "差".equals(tTsYsplan.getScore3())) {
             tTsYsplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsYsplan.getScore1()) && "好".equals(tTsYsplan.getScore2())) {
+        if (("差".equals(tTsYsplan.getScore1())||"差".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if ("差".equals(tTsYsplan.getScore1()) && "满意".equals(tTsYsplan.getScore2())) {
+        if (("差".equals(tTsYsplan.getScore1())||"差".equals(ysplan.getScore1())) && "满意".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(4L);
         }
-        if ("差".equals(tTsYsplan.getScore1()) && "差".equals(tTsYsplan.getScore2())) {
+        if (("差".equals(tTsYsplan.getScore1())||"差".equals(ysplan.getScore1())) && "差".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(4L);
         }
         tTsYsplanService.updateTTsYsplan(tTsYsplan);

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsFirstplanServiceImpl.java

@@ -84,13 +84,14 @@ public class TTsFirstplanServiceImpl implements ITTsFirstplanService {
      */
     @Override
     public int updateTTsFirstplan(TTsFirstplan tTsFirstplan) {
+        TTsFirstplan firstplan = tTsFirstplanMapper.selectTTsFirstplanById(tTsFirstplan.getId());
         if ("合格".equals(tTsFirstplan.getScore1())) {
             tTsFirstplan.setPlanStatus(5L);
         }
-        if ("不合格".equals(tTsFirstplan.getScore1()) && "合格".equals(tTsFirstplan.getScore2())) {
+        if (("不合格".equals(tTsFirstplan.getScore1())||"不合格".equals(firstplan.getScore1())) && "合格".equals(tTsFirstplan.getScore2())) {
             tTsFirstplan.setPlanStatus(5L);
         }
-        if ("不合格".equals(tTsFirstplan.getScore1()) && "不合格".equals(tTsFirstplan.getScore2())) {
+        if (("不合格".equals(tTsFirstplan.getScore1())||"不合格".equals(firstplan.getScore1()))&& "不合格".equals(tTsFirstplan.getScore2())) {
             tTsFirstplan.setPlanStatus(4L);
         }
         tTsFirstplanMapper.updateTTsFirstplan(tTsFirstplan);