Sfoglia il codice sorgente

-修改导师带徒学习状态

jiangbiao 1 anno fa
parent
commit
47e9e1b3f1

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

@@ -59,14 +59,14 @@ public class TTsFirstplanController extends BaseController {
         List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
             if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
-                list.get(i).setStudy("1");
-                list.get(i + 1).setStudy("1");
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())){
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         return getDataTable(list);
@@ -77,14 +77,14 @@ public class TTsFirstplanController extends BaseController {
         List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
             if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
-                list.get(i).setStudy("1");
-                list.get(i + 1).setStudy("1");
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())){
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         return AjaxResult.success(list);

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

@@ -92,16 +92,16 @@ public class TTsFlplanController extends BaseController {
             }
         }
             for (int i = 0; i < list.size(); i++) {
-            if (i == 0) {
-                list.get(i).setStudy("1");
-            }
-            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 (StringUtils.isEmpty(list.get(i).getStudy())) {
-                list.get(i).setStudy("0");
-            }
+                if (i == 0) {
+                    list.get(i).setStudy(1);
+                }
+                if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                    list.get(i).setStudy(1);
+                    list.get(i + 1).setStudy(1);
+                }
+                if (list.get(i).getStudy()==null){
+                    list.get(i).setStudy(0);
+                }
         }
         startPage();
         return getDataTable(list);
@@ -116,14 +116,14 @@ public class TTsFlplanController extends BaseController {
         List<TTsFlplan> list = tTsFlplanService.selectTTsFlplanList(tTsFlplan);
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())){
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         return AjaxResult.success(list);

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

@@ -91,14 +91,14 @@ public class TTsFtplanController extends BaseController {
         }
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())){
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         startPage();
@@ -114,14 +114,14 @@ public class TTsFtplanController extends BaseController {
         List<TTsFtplan> list = tTsFtplanService.selectTTsFtplanList(tTsFtplan);
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())){
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         return AjaxResult.success(list);

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

@@ -93,14 +93,14 @@ public class TTsLjplanController extends BaseController {
         }
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())) {
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
 
@@ -117,14 +117,14 @@ public class TTsLjplanController extends BaseController {
         List<TTsLjplan> list = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())) {
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         return AjaxResult.success(list);

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

@@ -93,14 +93,14 @@ public class TTsYsplanController extends BaseController {
         }
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())) {
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
 
@@ -117,14 +117,14 @@ public class TTsYsplanController extends BaseController {
         List<TTsYsplan> list = tTsYsplanService.selectTTsYsplanList(tTsYsplan);
         for (int i = 0; i < list.size(); i++) {
             if (i == 0) {
-                list.get(i).setStudy("1");
+                list.get(i).setStudy(1);
             }
-            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 (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
+                list.get(i).setStudy(1);
+                list.get(i + 1).setStudy(1);
             }
-            if (StringUtils.isEmpty(list.get(i).getStudy())) {
-                list.get(i).setStudy("0");
+            if (list.get(i).getStudy()==null){
+                list.get(i).setStudy(0);
             }
         }
         return AjaxResult.success(list);

+ 3 - 3
master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFirstplan.java

@@ -142,13 +142,13 @@ public class TTsFirstplan extends BaseEntity
 
     private String nickName;
 
-    private String study;
+    private Integer study;
 
-    public String getStudy() {
+    public Integer getStudy() {
         return study;
     }
 
-    public void setStudy(String study) {
+    public void setStudy(Integer study) {
         this.study = study;
     }
 

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

@@ -137,13 +137,13 @@ public class TTsFlplan extends BaseEntity
 
     private Long pid;
 
-    private String study;
+    private Integer study;
 
-    public String getStudy() {
+    public Integer getStudy() {
         return study;
     }
 
-    public void setStudy(String study) {
+    public void setStudy(Integer study) {
         this.study = study;
     }
 

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

@@ -66,13 +66,13 @@ public class TTsFtplan extends BaseEntity
     /** 删除状态 */
     private Long delFlag;
 
-    private String study;
+    private Integer study;
 
-    public String getStudy() {
+    public Integer getStudy() {
         return study;
     }
 
-    public void setStudy(String study) {
+    public void setStudy(Integer study) {
         this.study = study;
     }
 

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

@@ -135,13 +135,13 @@ public class TTsLjplan extends BaseEntity
 
     private Long pid;
 
-    private String study;
+    private Integer study;
 
-    public String getStudy() {
+    public Integer getStudy() {
         return study;
     }
 
-    public void setStudy(String study) {
+    public void setStudy(Integer study) {
         this.study = study;
     }
 

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

@@ -135,13 +135,13 @@ public class TTsYsplan extends BaseEntity
 
     private String scorePass;
 
-    private String study;
+    private Integer study;
 
-    public String getStudy() {
+    public Integer getStudy() {
         return study;
     }
 
-    public void setStudy(String study) {
+    public void setStudy(Integer study) {
         this.study = study;
     }