瀏覽代碼

修改导师带徒流程

jiangbiao 1 年之前
父節點
當前提交
498339e24d

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

@@ -112,7 +112,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) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1&&need.getPlanStatus()==0) {
                     need.setPlanStatus(2L);
                 }
             }

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

@@ -150,7 +150,7 @@ public class TTsFlplanController extends BaseController {
                 need.setTimer(timer + 1);
                 if (need.getTimerNeed() == null)
                     need.setTimerNeed(0.0);
-                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1&&need.getPlanStatus()==0) {
                     need.setPlanStatus(2L);
                 }
             }

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

@@ -149,7 +149,7 @@ public class TTsFtplanController extends BaseController {
                 need.setTimer(timer + 1);
                 if (need.getTimerNeed() == null)
                     need.setTimerNeed(0.0);
-                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1&&need.getPlanStatus()==0) {
                     need.setPlanStatus(2L);
                 }
             }

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

@@ -154,7 +154,7 @@ public class TTsLjplanController extends BaseController {
                 need.setTimer(timer + 1);
                 if (need.getTimerNeed() == null)
                     need.setTimerNeed(0.0);
-                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1&&need.getPlanStatus()==0) {
                     need.setPlanStatus(2L);
                 }
             }

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

@@ -150,7 +150,7 @@ public class TTsYsplanController extends BaseController {
                 need.setTimer(timer + 1);
                 if (need.getTimerNeed() == null)
                     need.setTimerNeed(0.0);
-                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1&&need.getPlanStatus()==0) {
                     need.setPlanStatus(2L);
                 }
             }

+ 3 - 0
ui/src/views/training/bccnew/firstplan/index_student.vue

@@ -538,6 +538,9 @@ export default {
       let _this = this;
       timer = window.setInterval(function () {
         updateFirstLearnTime(row).then(res => {
+
+        });
+        this.$nextTick(() => {
           getFirstplan(row.id).then(res => {
             this.file.data.timer = res.data.timer
           })

+ 16 - 8
ui/src/views/training/bccnew/tsnew/score_student.vue

@@ -420,29 +420,37 @@ export default {
       if (this.planType === 1) {
         timer = window.setInterval(function () {
           updateLjLearnTime(row).then(res => {
-            this.file.data.timer = res.data
-            this.learnTime+=res.data;
+            this.$nextTick(() => {
+              this.file.data.timer = res.data
+              this.learnTime+=res.data;
+            })
           })
         }, 60000);
       } else if (this.planType === 2) {
         timer = window.setInterval(function () {
           updateYsLearnTime(row).then(res => {
-            this.file.data.timer = res.data
-            this.learnTime+=res.data;
+            this.$nextTick(() => {
+              this.file.data.timer = res.data
+              this.learnTime+=res.data;
+            })
           })
         }, 60000);
       } else if (this.planType === 3) {
         timer = window.setInterval(function () {
           updateFlLearnTime(row).then(res => {
-            this.file.data.timer = res.data
-            this.learnTime+=res.data;
+            this.$nextTick(() => {
+              this.file.data.timer = res.data
+              this.learnTime+=res.data;
+            })
           })
         }, 60000);
       } else if (this.planType === 4) {
         timer = window.setInterval(function () {
           updateFtLearnTime(row).then(res => {
-            this.file.data.timer = res.data
-            this.learnTime+=res.data;
+            this.$nextTick(() => {
+              this.file.data.timer = res.data
+              this.learnTime+=res.data;
+            })
           })
         }, 60000);
       }