-导师带徒bugfix

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

@@ -187,25 +187,25 @@ public class TTsApproveController extends BaseController {
                 switch (tTsApprove.getPlanType()) {
                     case "1": {
                         TTsLjplan item = tTsLjplanService.selectTTsLjplanById(tTsApprove.getContentId());
-                        item.setScorePass("1");
+                        item.setScorePass(1);
                         tTsLjplanService.updateTTsLjplan(item);
                         break;
                     }
                     case "2": {
                         TTsYsplan item = tTsYsplanService.selectTTsYsplanById(tTsApprove.getContentId());
-                        item.setScorePass("1");
+                        item.setScorePass(1);
                         tTsYsplanService.updateTTsYsplan(item);
                         break;
                     }
                     case "3": {
                         TTsFlplan item = tTsFlplanService.selectTTsFlplanById(tTsApprove.getContentId());
-                        item.setScorePass("1");
+                        item.setScorePass(1);
                         tTsFlplanService.updateTTsFlplan(item);
                         break;
                     }
                     case "4": {
                         TTsFtplan item = tTsFtplanService.selectTTsFtplanById(tTsApprove.getContentId());
-                        item.setScorePass("1");
+                        item.setScorePass(1);
                         tTsFtplanService.updateTTsFtplan(item);
                         break;
                     }

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

@@ -63,7 +63,9 @@ public class TTsFirstplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -81,7 +83,9 @@ public class TTsFirstplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);

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

@@ -96,7 +96,9 @@ public class TTsFlplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -119,7 +121,9 @@ public class TTsFlplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -209,7 +213,7 @@ public class TTsFlplanController extends BaseController {
         }
         if ((("满意".equals(tTsFlplan.getScore1()) || "差".equals(tTsFlplan.getScore1())) && tTsFlplan.getScore2() == null) ||
                 (("满意".equals(tTsFlplan.getScore2()) || "差".equals(tTsFlplan.getScore2())) && tTsFlplan.getScore3() == null)) {
-            tTsFlplan.setScorePass("0");
+            tTsFlplan.setScorePass(0);
             tTsApproveService.doApprove(flplan.getId(), "3", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsFlplan.getScore1()) || "满意".equals(flplan.getScore1())) && "好".equals(tTsFlplan.getScore2())) {

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

@@ -96,7 +96,9 @@ public class TTsFtplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -119,7 +121,9 @@ public class TTsFtplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -208,7 +212,7 @@ public class TTsFtplanController extends BaseController {
         }
         if ((("满意".equals(tTsFtplan.getScore1()) || "差".equals(tTsFtplan.getScore1())) && tTsFtplan.getScore2() == null) ||
                 (("满意".equals(tTsFtplan.getScore2()) || "差".equals(tTsFtplan.getScore2())) && tTsFtplan.getScore3() == null)) {
-            tTsFtplan.setScorePass("0");
+            tTsFtplan.setScorePass(0);
             tTsApproveService.doApprove(ftplan.getId(), "4", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsFtplan.getScore1()) || "满意".equals(ftplan.getScore1())) && "好".equals(tTsFtplan.getScore2())) {

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

@@ -96,7 +96,9 @@ public class TTsLjplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -120,7 +122,9 @@ public class TTsLjplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -213,7 +217,7 @@ public class TTsLjplanController extends BaseController {
         }
         if ((("满意".equals(tTsLjplan.getScore1()) || "差".equals(tTsLjplan.getScore1())) && tTsLjplan.getScore2() == null) ||
                 (("满意".equals(tTsLjplan.getScore2()) || "差".equals(tTsLjplan.getScore2())) && tTsLjplan.getScore3() == null)) {
-            tTsLjplan.setScorePass("0");
+            tTsLjplan.setScorePass(0);
             tTsApproveService.doApprove(ljplan.getId(), "1", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsLjplan.getScore1()) || "满意".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {

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

@@ -96,7 +96,9 @@ public class TTsYsplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -120,7 +122,9 @@ public class TTsYsplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                list.get(i + 1).setStudy(1);
+                if(i < list.size() - 1) {
+                    list.get(i + 1).setStudy(1);
+                }
             }
             if (list.get(i).getStudy() == null) {
                 list.get(i).setStudy(0);
@@ -210,7 +214,7 @@ public class TTsYsplanController extends BaseController {
         }
         if ((("满意".equals(tTsYsplan.getScore1()) || "差".equals(tTsYsplan.getScore1())) && tTsYsplan.getScore2() == null) ||
                 (("满意".equals(tTsYsplan.getScore2()) || "差".equals(tTsYsplan.getScore2())) && tTsYsplan.getScore3() == null)) {
-            tTsYsplan.setScorePass("0");
+            tTsYsplan.setScorePass(0);
             tTsApproveService.doApprove(ysplan.getId(), "2", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsYsplan.getScore1()) || "满意".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFlplan.java

@@ -133,7 +133,7 @@ public class TTsFlplan extends BaseEntity
 
     private String planStartData;
 
-    private String scorePass;
+    private Integer scorePass;
 
     private Long pid;
 
@@ -155,11 +155,11 @@ public class TTsFlplan extends BaseEntity
         this.pid = pid;
     }
 
-    public String getScorePass() {
+    public Integer getScorePass() {
         return scorePass;
     }
 
-    public void setScorePass(String scorePass) {
+    public void setScorePass(Integer scorePass) {
         this.scorePass = scorePass;
     }
 

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFtplan.java

@@ -141,7 +141,7 @@ public class TTsFtplan extends BaseEntity
 
     private String planStartData;
 
-    private String scorePass;
+    private Integer scorePass;
 
     private Long pid;
 
@@ -153,11 +153,11 @@ public class TTsFtplan extends BaseEntity
         this.pid = pid;
     }
 
-    public String getScorePass() {
+    public Integer getScorePass() {
         return scorePass;
     }
 
-    public void setScorePass(String scorePass) {
+    public void setScorePass(Integer scorePass) {
         this.scorePass = scorePass;
     }
 

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsLjplan.java

@@ -131,7 +131,7 @@ public class TTsLjplan extends BaseEntity
 
     private String planStartData;
 
-    private String scorePass;
+    private Integer scorePass;
 
     private Long pid;
 
@@ -153,11 +153,11 @@ public class TTsLjplan extends BaseEntity
         this.pid = pid;
     }
 
-    public String getScorePass() {
+    public Integer getScorePass() {
         return scorePass;
     }
 
-    public void setScorePass(String scorePass) {
+    public void setScorePass(Integer scorePass) {
         this.scorePass = scorePass;
     }
 

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsYsplan.java

@@ -133,7 +133,7 @@ public class TTsYsplan extends BaseEntity
 
     private String planStartData;
 
-    private String scorePass;
+    private Integer scorePass;
 
     private Integer study;
 
@@ -153,11 +153,11 @@ public class TTsYsplan extends BaseEntity
         this.pid = pid;
     }
 
-    public String getScorePass() {
+    public Integer getScorePass() {
         return scorePass;
     }
 
-    public void setScorePass(String scorePass) {
+    public void setScorePass(Integer scorePass) {
         this.scorePass = scorePass;
     }
 

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

@@ -87,15 +87,12 @@ public class TTsFirstplanServiceImpl implements ITTsFirstplanService {
         TTsFirstplan firstplan = tTsFirstplanMapper.selectTTsFirstplanById(tTsFirstplan.getId());
         if ("合格".equals(tTsFirstplan.getScore1())) {
             tTsFirstplan.setPlanStatus(5L);
-            tTsFirstplan.setTrainerConfirm(firstplan.getTrainer());
         }
         if (("不合格".equals(tTsFirstplan.getScore1())||"不合格".equals(firstplan.getScore1())) && "合格".equals(tTsFirstplan.getScore2())) {
             tTsFirstplan.setPlanStatus(5L);
-            tTsFirstplan.setTrainerConfirm(firstplan.getTrainer());
         }
         if (("不合格".equals(tTsFirstplan.getScore1())||"不合格".equals(firstplan.getScore1()))&& "不合格".equals(tTsFirstplan.getScore2())) {
             tTsFirstplan.setPlanStatus(4L);
-            tTsFirstplan.setTrainerConfirm(firstplan.getTrainer());
         }
         tTsFirstplanMapper.updateTTsFirstplan(tTsFirstplan);
         if (tTsFirstplan.getPlanStatus() != null) {

ui/src/views/training/bccnew/tsnew/score.vue

@@ -79,7 +79,7 @@
       <el-table-column label="第二次成绩" align="center" prop="score2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <div
-            v-if="scope.row.scorePass!='0'&&scope.row.score2 == null&&scope.row.planStatus==2&&(scope.row.score1 == '满意'||scope.row.score1 == '差')">
+            v-if="scope.row.scorePass!=0&&scope.row.score2 == null&&scope.row.planStatus==2&&(scope.row.score1 == '满意'||scope.row.score1 == '差')">
             <el-select v-model="scope.row.score2Tmp" style="width: 130px" placeholder="请选择成绩">
               <el-option value="好" label="好" key="好"/>
               <el-option value="满意" label="满意" key="满意"/>
@@ -99,7 +99,7 @@
       <el-table-column label="第三次成绩" align="center" prop="score3" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <div
-            v-if="scope.row.scorePass!='0'&&scope.row.score3 == null&&scope.row.planStatus==2&&((scope.row.score1 == '满意'||scope.row.score1 == '差')&&(scope.row.score2 == '满意'||scope.row.score2 == '差'))">
+            v-if="scope.row.scorePass!=0&&scope.row.score3 == null&&scope.row.planStatus==2&&((scope.row.score1 == '满意'||scope.row.score1 == '差')&&(scope.row.score2 == '满意'||scope.row.score2 == '差'))">
             <el-select v-model="scope.row.score3Tmp" style="width: 130px" placeholder="请选择成绩">
               <el-option value="好" label="好" key="好"/>
               <el-option value="满意" label="满意" key="满意"/>