Merge remote-tracking branch 'origin/master'

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

@@ -57,12 +57,37 @@ public class TTsFirstplanController extends BaseController {
     public TableDataInfo list(TTsFirstplan tTsFirstplan) {
         startPage();
         List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
+        for (int i = 0; i < list.size(); i++) {
+            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 (StringUtils.isEmpty(list.get(i).getStudy())){
+                list.get(i).setStudy("0");
+            }
+        }
         return getDataTable(list);
     }
 
     @GetMapping("/listAll")
     public AjaxResult listAll(TTsFirstplan tTsFirstplan) {
-        return AjaxResult.success(tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan));
+        List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
+        for (int i = 0; i < list.size(); i++) {
+            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 (StringUtils.isEmpty(list.get(i).getStudy())){
+                list.get(i).setStudy("0");
+            }
+        }
+        return AjaxResult.success(list);
     }
 
     @GetMapping("/listAllByTrainer")

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -89,8 +90,17 @@ public class TTsFlplanController extends BaseController {
                 entity.setPlanStartData(planDate.toString());
                 list.add(entity);
             }
+            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");
+            }
         }
-
         startPage();
         return getDataTable(list);
     }
@@ -101,7 +111,20 @@ public class TTsFlplanController extends BaseController {
      */
     @GetMapping("/listAll")
     public AjaxResult listAll(TTsFlplan tTsFlplan) {
-        return AjaxResult.success(tTsFlplanService.selectTTsFlplanList(tTsFlplan));
+        List<TTsFlplan> list = tTsFlplanService.selectTTsFlplanList(tTsFlplan);
+        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");
+            }
+        }
+        return AjaxResult.success(list);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -87,8 +88,17 @@ public class TTsFtplanController extends BaseController {
                 entity.setPlanStartData(planDate.toString());
                 list.add(entity);
             }
+            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");
+            }
         }
-
         startPage();
         return getDataTable(list);
     }
@@ -99,7 +109,20 @@ public class TTsFtplanController extends BaseController {
      */
     @GetMapping("/listAll")
     public AjaxResult listAll(TTsFtplan tTsFtplan) {
-        return AjaxResult.success(tTsFtplanService.selectTTsFtplanList(tTsFtplan));
+        List<TTsFtplan> list = tTsFtplanService.selectTTsFtplanList(tTsFtplan);
+        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");
+            }
+        }
+        return AjaxResult.success(list);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -8,7 +9,6 @@ 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;
@@ -75,7 +75,7 @@ public class TTsLjplanController extends BaseController {
                     entity.setContent(content.toString());// 设置返回对象内容
                     entity.setPlanStartData(planDate.toString());// 设置返回对象计划培训时间
                     list.add(entity);
-                    entity=item; // 修改新主题对象
+                    entity = item; // 修改新主题对象
                     content = new StringBuilder();
                     planDate = new StringBuilder();
                     if (item.getPlanDate() != null)
@@ -90,6 +90,16 @@ public class TTsLjplanController extends BaseController {
                 entity.setPlanStartData(planDate.toString());
                 list.add(entity);
             }
+            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");
+            }
         }
 
         startPage();
@@ -102,7 +112,20 @@ public class TTsLjplanController extends BaseController {
      */
     @GetMapping("/listAll")
     public AjaxResult listAll(TTsLjplan tTsLjplan) {
-        return AjaxResult.success(tTsLjplanService.selectTTsLjplanList(tTsLjplan));
+        List<TTsLjplan> list = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
+        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");
+            }
+        }
+        return AjaxResult.success(list);
     }
 
     /**
@@ -156,7 +179,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&&need.getPlanStatus()==0) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1 && need.getPlanStatus() == 0) {
                     need.setPlanStatus(2L);
                 }
             }
@@ -192,34 +215,34 @@ public class TTsLjplanController extends BaseController {
             tTsLjplan.setScorePass("0");
             tTsApproveService.doApprove(ljplan.getId(), "1", getUserId(), getNickName(), "dsdtNoPass");
         }
-        if (("满意".equals(tTsLjplan.getScore1())||"满意".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {
+        if (("满意".equals(tTsLjplan.getScore1()) || "满意".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if (("满意".equals(tTsLjplan.getScore1())||"满意".equals(ljplan.getScore1())) && ("满意".equals(tTsLjplan.getScore2())||"满意".equals(ljplan.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(ljplan.getScore1())) && ("差".equals(tTsLjplan.getScore2())||"差".equals(ljplan.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(ljplan.getScore1())) && ("满意".equals(tTsLjplan.getScore2())||"满意".equals(ljplan.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(ljplan.getScore1())) && ("差".equals(tTsLjplan.getScore2())||"差".equals(ljplan.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(ljplan.getScore1())) && ("满意".equals(tTsLjplan.getScore2())||"满意".equals(ljplan.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(ljplan.getScore1())) && ("差".equals(tTsLjplan.getScore2())||"差".equals(ljplan.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(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {
+        if (("差".equals(tTsLjplan.getScore1()) || "差".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(5L);
         }
-        if (("差".equals(tTsLjplan.getScore1())||"差".equals(ljplan.getScore1())) && "满意".equals(tTsLjplan.getScore2())) {
+        if (("差".equals(tTsLjplan.getScore1()) || "差".equals(ljplan.getScore1())) && "满意".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(4L);
         }
-        if (("差".equals(tTsLjplan.getScore1())||"差".equals(ljplan.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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -8,7 +9,9 @@ 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.*;
+import com.ruoyi.project.training.bccnew.domain.TTsNew;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplanContent;
 import com.ruoyi.project.training.bccnew.service.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +75,7 @@ public class TTsYsplanController extends BaseController {
                     entity.setContent(content.toString());
                     entity.setPlanStartData(planDate.toString());
                     list.add(entity);
-                    entity=item;
+                    entity = item;
                     content = new StringBuilder();
                     planDate = new StringBuilder();
                     if (item.getPlanDate() != null)
@@ -87,6 +90,16 @@ public class TTsYsplanController extends BaseController {
                 entity.setPlanStartData(planDate.toString());
                 list.add(entity);
             }
+            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");
+            }
         }
 
         startPage();
@@ -99,7 +112,20 @@ public class TTsYsplanController extends BaseController {
      */
     @GetMapping("/listAll")
     public AjaxResult listAll(TTsYsplan tTsYsplan) {
-        return AjaxResult.success(tTsYsplanService.selectTTsYsplanList(tTsYsplan));
+        List<TTsYsplan> list = tTsYsplanService.selectTTsYsplanList(tTsYsplan);
+        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");
+            }
+        }
+        return AjaxResult.success(list);
     }
 
     /**
@@ -151,7 +177,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&&need.getPlanStatus()==0) {
+                if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1 && need.getPlanStatus() == 0) {
                     need.setPlanStatus(2L);
                 }
             }
@@ -186,34 +212,34 @@ public class TTsYsplanController extends BaseController {
             tTsYsplan.setScorePass("0");
             tTsApproveService.doApprove(ysplan.getId(), "2", getUserId(), getNickName(), "dsdtNoPass");
         }
-        if (("满意".equals(tTsYsplan.getScore1())||"满意".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {
+        if (("满意".equals(tTsYsplan.getScore1()) || "满意".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if (("满意".equals(tTsYsplan.getScore1())||"满意".equals(ysplan.getScore1())) && ("满意".equals(tTsYsplan.getScore2())||"满意".equals(ysplan.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(ysplan.getScore1())) && ("差".equals(tTsYsplan.getScore2())||"差".equals(ysplan.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(ysplan.getScore1())) && ("满意".equals(tTsYsplan.getScore2())||"满意".equals(ysplan.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(ysplan.getScore1())) && ("差".equals(tTsYsplan.getScore2())||"差".equals(ysplan.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(ysplan.getScore1())) && ("满意".equals(tTsYsplan.getScore2())||"满意".equals(ysplan.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(ysplan.getScore1())) && ("差".equals(tTsYsplan.getScore2())||"差".equals(ysplan.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(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {
+        if (("差".equals(tTsYsplan.getScore1()) || "差".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(5L);
         }
-        if (("差".equals(tTsYsplan.getScore1())||"差".equals(ysplan.getScore1())) && "满意".equals(tTsYsplan.getScore2())) {
+        if (("差".equals(tTsYsplan.getScore1()) || "差".equals(ysplan.getScore1())) && "满意".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(4L);
         }
-        if (("差".equals(tTsYsplan.getScore1())||"差".equals(ysplan.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/domain/TTsFirstplan.java

@@ -142,6 +142,16 @@ public class TTsFirstplan extends BaseEntity
 
     private String nickName;
 
+    private String study;
+
+    public String getStudy() {
+        return study;
+    }
+
+    public void setStudy(String study) {
+        this.study = study;
+    }
+
     public Long getTrainerId() {
         return trainerId;
     }

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

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

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

@@ -66,6 +66,16 @@ public class TTsFtplan extends BaseEntity
     /** 删除状态 */
     private Long delFlag;
 
+    private String study;
+
+    public String getStudy() {
+        return study;
+    }
+
+    public void setStudy(String study) {
+        this.study = study;
+    }
+
     /** 创建人 */
     @Excel(name = "创建人")
     private String createrCode;

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

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

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

@@ -135,6 +135,16 @@ public class TTsYsplan extends BaseEntity
 
     private String scorePass;
 
+    private String study;
+
+    public String getStudy() {
+        return study;
+    }
+
+    public void setStudy(String study) {
+        this.study = study;
+    }
+
     public Long getPid() {
         return pid;
     }

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

@@ -191,7 +191,7 @@ public class TTsNewServiceImpl implements ITTsNewService {
                                 tTsFirstplan.setTrainingPlanDate(rosters.get(i).getShiftDate());
                             }
                             studyCount = 0;
-                            c=1;
+                            c=0;
                         }
                     }else{
                         // 学习时长累计大于6个小时时往后再延一天

master/src/main/resources/application.yml

@@ -79,6 +79,7 @@ spring:
   redis:
 #    # 地址
     host: 47.114.101.16
+#    host: localhost
     # 端口，默认为6379
     port: 6379
     # 密码

ui/src/views/patrol/home/dashboard/NoticeChart.vue

@@ -4,10 +4,10 @@
       <ul class="allNotice" @mouseleave="handleMouseLeave" @mouseover="handleMouseOver">
         <li v-for="(item,index) in noticeList" class="info">
           <span
-            style="padding-left: 20px; display: inline-block; width: 30%">截止日期：{{
+            style="padding-left: 20px; display: inline-block; width: 30%;color: #000">截止日期：{{
               parseTime(item.deadline, '{yyyy}-{mm}-{dd}')
             }}</span>
-          <span style="padding-left: 20px; display: inline-block; width: 60%">{{ item.planName }}</span>
+          <span style="padding-left: 20px; display: inline-block; width: 60%;color: #000">{{ item.planName }}</span>
           <span style="padding-left: 20px; display: inline-block; width: 10%">
             <el-tag v-if="item.status==0" effect="dark" type="danger">未完成</el-tag>
             <el-tag v-if="item.status==1" effect="dark" type="success">已完成</el-tag>