导师带徒 修改培训内容

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

@@ -8,15 +8,14 @@ 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.TTsFlplanContent;
-import com.ruoyi.project.training.bccnew.domain.TTsLjplanContent;
-import com.ruoyi.project.training.bccnew.domain.TTsNew;
+import com.ruoyi.project.training.bccnew.domain.*;
 import com.ruoyi.project.training.bccnew.service.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,7 +46,58 @@ public class TTsFlplanController extends BaseController {
      * 查询分离培训列表
      */
     @GetMapping("/list")
-    public AjaxResult list(TTsFlplan tTsFlplan) {
+    public TableDataInfo list(TTsFlplan tTsFlplan) {
+        List<TTsFlplan> list = new ArrayList<>();
+        List<TTsFlplan> tTsFlplans = tTsFlplanService.selectTTsFlplanList(tTsFlplan);
+        StringBuilder content = null;
+        StringBuilder planDate = null;
+        TTsFlplan entity = null;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        for (int i = 0; i < tTsFlplans.size(); i++) {
+            TTsFlplan item = tTsFlplans.get(i);
+            if (i == 0) {
+                entity = item;
+                content = new StringBuilder();
+                planDate = new StringBuilder();
+                if (item.getPlanDate() != null)
+                    planDate.append(format.format(item.getPlanDate()));
+                content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+            } else {
+                if (entity.getTopic().equals(item.getTopic())) {
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                } else {
+                    if (tTsFlplans.get(i - 1).getPlanDate() != null)
+                        planDate.append(" ~ ").append(format.format(tTsFlplans.get(i - 1).getPlanDate()));
+                    entity.setContent(content.toString());
+                    entity.setPlanStartData(planDate.toString());
+                    list.add(entity);
+                    entity=item;
+                    content = new StringBuilder();
+                    planDate = new StringBuilder();
+                    if (item.getPlanDate() != null)
+                        planDate.append(format.format(item.getPlanDate()));
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                }
+            }
+            if (i + 1 == tTsFlplans.size()) {
+                if (item.getPlanDate() != null)
+                    planDate.append(" ~ ").append(format.format(item.getPlanDate()));
+                entity.setContent(content.toString());
+                entity.setPlanStartData(planDate.toString());
+                list.add(entity);
+            }
+        }
+
+        startPage();
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询分离培训列表
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(TTsFlplan tTsFlplan) {
         return AjaxResult.success(tTsFlplanService.selectTTsFlplanList(tTsFlplan));
     }
 
@@ -137,6 +187,9 @@ public class TTsFlplanController extends BaseController {
         if ("满意".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(5L);
         }
+        if ("满意".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2()) && "差".equals(tTsFlplan.getScore3())) {
+            tTsFlplan.setPlanStatus(4L);
+        }
         if ("差".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(5L);
         }
@@ -147,18 +200,20 @@ public class TTsFlplanController extends BaseController {
             tTsFlplan.setPlanStatus(4L);
         }
         tTsFlplanService.updateTTsFlplan(tTsFlplan);
-        if (tTsFlplan.getPlanStatus() == 5) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(5L);
-            tTsNew.setPlanType(3L);
-            tTsNew.setNewId(tTsFlplan.getNewId());
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
-        } else if (tTsFlplan.getPlanStatus() == 4) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(4L);
-            tTsNew.setPlanType(3L);
-            tTsNew.setNewId(tTsFlplan.getNewId());
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+        if (tTsFlplan.getPlanStatus() !=null) {
+            if (tTsFlplan.getPlanStatus() == 5) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(5L);
+                tTsNew.setPlanType(3L);
+                tTsNew.setNewId(tTsFlplan.getNewId());
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+            } else if (tTsFlplan.getPlanStatus() == 4) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(4L);
+                tTsNew.setPlanType(3L);
+                tTsNew.setNewId(tTsFlplan.getNewId());
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+            }
         }
         return AjaxResult.success();
     }

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

@@ -14,6 +14,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,7 +46,58 @@ public class TTsFtplanController extends BaseController {
      * 查询芳烃培训列表
      */
     @GetMapping("/list")
-    public AjaxResult list(TTsFtplan tTsFtplan) {
+    public TableDataInfo list(TTsFtplan tTsFtplan) {
+        List<TTsFtplan> list = new ArrayList<>();
+        List<TTsFtplan> tTsFtplans = tTsFtplanService.selectTTsFtplanList(tTsFtplan);
+        StringBuilder content = null;
+        StringBuilder planDate = null;
+        TTsFtplan entity = null;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        for (int i = 0; i < tTsFtplans.size(); i++) {
+            TTsFtplan item = tTsFtplans.get(i);
+            if (i == 0) {
+                entity = item;
+                content = new StringBuilder();
+                planDate = new StringBuilder();
+                if (item.getPlanDate() != null)
+                    planDate.append(format.format(item.getPlanDate()));
+                content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+            } else {
+                if (entity.getTopic().equals(item.getTopic())) {
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                } else {
+                    if (tTsFtplans.get(i - 1).getPlanDate() != null)
+                        planDate.append(" ~ ").append(format.format(tTsFtplans.get(i - 1).getPlanDate()));
+                    entity.setContent(content.toString());
+                    entity.setPlanStartData(planDate.toString());
+                    list.add(entity);
+                    entity=item;
+                    content = new StringBuilder();
+                    planDate = new StringBuilder();
+                    if (item.getPlanDate() != null)
+                        planDate.append(format.format(item.getPlanDate()));
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                }
+            }
+            if (i + 1 == tTsFtplans.size()) {
+                if (item.getPlanDate() != null)
+                    planDate.append(" ~ ").append(format.format(item.getPlanDate()));
+                entity.setContent(content.toString());
+                entity.setPlanStartData(planDate.toString());
+                list.add(entity);
+            }
+        }
+
+        startPage();
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询分离培训列表
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(TTsFtplan tTsFtplan) {
         return AjaxResult.success(tTsFtplanService.selectTTsFtplanList(tTsFtplan));
     }
 
@@ -133,6 +186,9 @@ public class TTsFtplanController extends BaseController {
         if ("满意".equals(tTsFtplan.getScore1()) && "差".equals(tTsFtplan.getScore2()) && "好".equals(tTsFtplan.getScore2())) {
             tTsFtplan.setPlanStatus(5L);
         }
+        if ("满意".equals(tTsFtplan.getScore1()) && "满意".equals(tTsFtplan.getScore2()) && "差".equals(tTsFtplan.getScore3())) {
+            tTsFtplan.setPlanStatus(4L);
+        }
         if ("差".equals(tTsFtplan.getScore1()) && "好".equals(tTsFtplan.getScore2())) {
             tTsFtplan.setPlanStatus(5L);
         }
@@ -143,18 +199,20 @@ public class TTsFtplanController extends BaseController {
             tTsFtplan.setPlanStatus(4L);
         }
         tTsFtplanService.updateTTsFtplan(tTsFtplan);
-        if (tTsFtplan.getPlanStatus() == 5) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(5L);
-            tTsNew.setPlanType(4L);
-            tTsNew.setNewId(tTsFtplan.getNewId());
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
-        } else if (tTsFtplan.getPlanStatus() == 4) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(4L);
-            tTsNew.setPlanType(4L);
-            tTsNew.setNewId(tTsFtplan.getNewId());
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+        if (tTsFtplan.getPlanStatus() !=null) {
+            if (tTsFtplan.getPlanStatus() == 5) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(5L);
+                tTsNew.setPlanType(4L);
+                tTsNew.setNewId(tTsFtplan.getNewId());
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+            } else if (tTsFtplan.getPlanStatus() == 4) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(4L);
+                tTsNew.setPlanType(4L);
+                tTsNew.setNewId(tTsFtplan.getNewId());
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+            }
         }
         return toAjax(1);
     }

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

@@ -8,12 +8,16 @@ 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.TTsLjplan;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplanContent;
+import com.ruoyi.project.training.bccnew.domain.TTsNew;
 import com.ruoyi.project.training.bccnew.service.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,7 +48,58 @@ public class TTsLjplanController extends BaseController {
      * 查询裂解培训列表
      */
     @GetMapping("/list")
-    public AjaxResult list(TTsLjplan tTsLjplan) {
+    public TableDataInfo list(TTsLjplan tTsLjplan) {
+        List<TTsLjplan> list = new ArrayList<>();
+        List<TTsLjplan> tTsLjplans = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
+        StringBuilder content = null;//内容
+        StringBuilder planDate = null;//计划培训时间
+        TTsLjplan entity = null;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        for (int i = 0; i < tTsLjplans.size(); i++) {
+            TTsLjplan item = tTsLjplans.get(i);
+            if (i == 0) { // 第一条数据
+                entity = item;
+                content = new StringBuilder();
+                planDate = new StringBuilder();
+                if (item.getPlanDate() != null)
+                    planDate.append(format.format(item.getPlanDate()));
+                content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；"); //拼接内容字段 培训计划：内容；
+            } else {
+                if (entity.getTopic().equals(item.getTopic())) { // 判断当前对象的主题是否为当前返回对象的主题
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                } else {
+                    if (tTsLjplans.get(i - 1).getPlanDate() != null)
+                        planDate.append(" ~ ").append(format.format(tTsLjplans.get(i - 1).getPlanDate())); // 拼接截止日期
+                    entity.setContent(content.toString());// 设置返回对象内容
+                    entity.setPlanStartData(planDate.toString());// 设置返回对象计划培训时间
+                    list.add(entity);
+                    entity=item; // 修改新主题对象
+                    content = new StringBuilder();
+                    planDate = new StringBuilder();
+                    if (item.getPlanDate() != null)
+                        planDate.append(format.format(item.getPlanDate()));
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                }
+            }
+            if (i + 1 == tTsLjplans.size()) { // 最后一条
+                if (item.getPlanDate() != null)
+                    planDate.append(" ~ ").append(format.format(item.getPlanDate()));
+                entity.setContent(content.toString());
+                entity.setPlanStartData(planDate.toString());
+                list.add(entity);
+            }
+        }
+
+        startPage();
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询分离培训列表
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(TTsLjplan tTsLjplan) {
         return AjaxResult.success(tTsLjplanService.selectTTsLjplanList(tTsLjplan));
     }
 
@@ -74,7 +129,7 @@ public class TTsLjplanController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TTsLjplan tTsLjplan) {
         int i = tTsLjplanService.insertTTsLjplan(tTsLjplan);
-        if (CollectionUtils.isNotEmpty(tTsLjplan.getContents())){
+        if (CollectionUtils.isNotEmpty(tTsLjplan.getContents())) {
             for (TTsLjplanContent content : tTsLjplan.getContents()) {
                 content.setPid(tTsLjplan.getId());
                 tTsLjplanContentService.insertTTsLjplanContent(content);
@@ -115,12 +170,12 @@ public class TTsLjplanController extends BaseController {
     @Log(title = "裂解培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsLjplan tTsLjplan) {
-        if (CollectionUtils.isNotEmpty(tTsLjplan.getContents())){
+        if (CollectionUtils.isNotEmpty(tTsLjplan.getContents())) {
             for (TTsLjplanContent content : tTsLjplan.getContents()) {
-                if (content.getId()==null) {
+                if (content.getId() == null) {
                     content.setPid(tTsLjplan.getId());
                     tTsLjplanContentService.insertTTsLjplanContent(content);
-                }else {
+                } else {
                     tTsLjplanContentService.updateTTsLjplanContent(content);
                 }
             }
@@ -137,6 +192,9 @@ public class TTsLjplanController extends BaseController {
         if ("满意".equals(tTsLjplan.getScore1()) && "差".equals(tTsLjplan.getScore2()) && "好".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(5L);
         }
+        if ("满意".equals(tTsLjplan.getScore1()) && "满意".equals(tTsLjplan.getScore2()) && "差".equals(tTsLjplan.getScore3())) {
+            tTsLjplan.setPlanStatus(4L);
+        }
         if ("差".equals(tTsLjplan.getScore1()) && "好".equals(tTsLjplan.getScore2())) {
             tTsLjplan.setPlanStatus(5L);
         }
@@ -147,19 +205,21 @@ public class TTsLjplanController extends BaseController {
             tTsLjplan.setPlanStatus(4L);
         }
         tTsLjplanService.updateTTsLjplan(tTsLjplan);
-        if (tTsLjplan.getPlanStatus() == 5) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(5L);
-            tTsNew.setNewId(tTsLjplan.getNewId());
-            tTsNew.setPlanType(1L);
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
-
-        } else if (tTsLjplan.getPlanStatus() == 4) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(4L);
-            tTsNew.setNewId(tTsLjplan.getNewId());
-            tTsNew.setPlanType(1L);
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+        if (tTsLjplan.getPlanStatus() != null) {
+            if (tTsLjplan.getPlanStatus() == 5) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(5L);
+                tTsNew.setNewId(tTsLjplan.getNewId());
+                tTsNew.setPlanType(1L);
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+
+            } else if (tTsLjplan.getPlanStatus() == 4) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(4L);
+                tTsNew.setNewId(tTsLjplan.getNewId());
+                tTsNew.setPlanType(1L);
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+            }
         }
         return toAjax(1);
     }

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

@@ -14,6 +14,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,7 +46,58 @@ public class TTsYsplanController extends BaseController {
      * 查询转岗培训列表
      */
     @GetMapping("/list")
-    public AjaxResult list(TTsYsplan tTsYsplan) {
+    public TableDataInfo list(TTsYsplan tTsYsplan) {
+        List<TTsYsplan> list = new ArrayList<>();
+        List<TTsYsplan> tTsYsplans = tTsYsplanService.selectTTsYsplanList(tTsYsplan);
+        StringBuilder content = null;
+        StringBuilder planDate = null;
+        TTsYsplan entity = null;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        for (int i = 0; i < tTsYsplans.size(); i++) {
+            TTsYsplan item = tTsYsplans.get(i);
+            if (i == 0) {
+                entity = item;
+                content = new StringBuilder();
+                planDate = new StringBuilder();
+                if (item.getPlanDate() != null)
+                    planDate.append(format.format(item.getPlanDate()));
+                content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+            } else {
+                if (entity.getTopic().equals(item.getTopic())) {
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                } else {
+                    if (tTsYsplans.get(i - 1).getPlanDate() != null)
+                        planDate.append(" ~ ").append(format.format(tTsYsplans.get(i - 1).getPlanDate()));
+                    entity.setContent(content.toString());
+                    entity.setPlanStartData(planDate.toString());
+                    list.add(entity);
+                    entity=item;
+                    content = new StringBuilder();
+                    planDate = new StringBuilder();
+                    if (item.getPlanDate() != null)
+                        planDate.append(format.format(item.getPlanDate()));
+                    content.append(item.getCourseDay()).append("：").append(item.getContent()).append("；");
+                }
+            }
+            if (i + 1 == tTsYsplans.size()) {
+                if (item.getPlanDate() != null)
+                    planDate.append(" ~ ").append(format.format(item.getPlanDate()));
+                entity.setContent(content.toString());
+                entity.setPlanStartData(planDate.toString());
+                list.add(entity);
+            }
+        }
+
+        startPage();
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询分离培训列表
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(TTsYsplan tTsYsplan) {
         return AjaxResult.success(tTsYsplanService.selectTTsYsplanList(tTsYsplan));
     }
 
@@ -74,7 +127,7 @@ public class TTsYsplanController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TTsYsplan tTsYsplan) {
         int i = tTsYsplanService.insertTTsYsplan(tTsYsplan);
-        if (CollectionUtils.isNotEmpty(tTsYsplan.getContents())){
+        if (CollectionUtils.isNotEmpty(tTsYsplan.getContents())) {
             for (TTsYsplanContent content : tTsYsplan.getContents()) {
                 content.setPid(tTsYsplan.getId());
                 tTsYsplanContentService.insertTTsYsplanContent(content);
@@ -112,12 +165,12 @@ public class TTsYsplanController extends BaseController {
     @Log(title = "转岗培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsYsplan tTsYsplan) {
-        if (CollectionUtils.isNotEmpty(tTsYsplan.getContents())){
+        if (CollectionUtils.isNotEmpty(tTsYsplan.getContents())) {
             for (TTsYsplanContent content : tTsYsplan.getContents()) {
-                if (content.getId()==null) {
+                if (content.getId() == null) {
                     content.setPid(tTsYsplan.getId());
                     tTsYsplanContentService.insertTTsYsplanContent(content);
-                }else {
+                } else {
                     tTsYsplanContentService.updateTTsYsplanContent(content);
                 }
             }
@@ -134,6 +187,9 @@ public class TTsYsplanController extends BaseController {
         if ("满意".equals(tTsYsplan.getScore1()) && "差".equals(tTsYsplan.getScore2()) && "好".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(5L);
         }
+        if ("满意".equals(tTsYsplan.getScore1()) && "满意".equals(tTsYsplan.getScore2()) && "差".equals(tTsYsplan.getScore3())) {
+            tTsYsplan.setPlanStatus(4L);
+        }
         if ("差".equals(tTsYsplan.getScore1()) && "好".equals(tTsYsplan.getScore2())) {
             tTsYsplan.setPlanStatus(5L);
         }
@@ -144,19 +200,21 @@ public class TTsYsplanController extends BaseController {
             tTsYsplan.setPlanStatus(4L);
         }
         tTsYsplanService.updateTTsYsplan(tTsYsplan);
-        if (tTsYsplan.getPlanStatus() == 5) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(5L);
-            tTsNew.setNewId(tTsYsplan.getNewId());
-            tTsNew.setPlanType(2L);
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
-
-        } else if (tTsYsplan.getPlanStatus() == 4) {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(5L);
-            tTsNew.setNewId(tTsYsplan.getNewId());
-            tTsNew.setPlanType(2L);
-            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+        if (tTsYsplan.getPlanStatus() != null) {
+            if (tTsYsplan.getPlanStatus() == 5) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(5L);
+                tTsNew.setNewId(tTsYsplan.getNewId());
+                tTsNew.setPlanType(2L);
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+
+            } else if (tTsYsplan.getPlanStatus() == 4) {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(5L);
+                tTsNew.setNewId(tTsYsplan.getNewId());
+                tTsNew.setPlanType(2L);
+                tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+            }
         }
         return toAjax(1);
     }

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

@@ -129,6 +129,26 @@ public class TTsFlplan extends BaseEntity
 
     private List<TTsFlplanContent> contents;
 
+    private Long isPc;
+
+    private String planStartData;
+
+    public String getPlanStartData() {
+        return planStartData;
+    }
+
+    public void setPlanStartData(String planStartData) {
+        this.planStartData = planStartData;
+    }
+
+    public Long getIsPc() {
+        return isPc;
+    }
+
+    public void setIsPc(Long isPc) {
+        this.isPc = isPc;
+    }
+
     public List<TTsFlplanContent> getContents() {
         return contents;
     }

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

@@ -129,6 +129,16 @@ public class TTsFtplan extends BaseEntity
 
     private List<TTsFtplanContent> contents;
 
+    private String planStartData;
+
+    public String getPlanStartData() {
+        return planStartData;
+    }
+
+    public void setPlanStartData(String planStartData) {
+        this.planStartData = planStartData;
+    }
+
     public List<TTsFtplanContent> getContents() {
         return contents;
     }

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

@@ -129,6 +129,17 @@ public class TTsLjplan extends BaseEntity
 
     private List<TTsLjplanContent> contents;
 
+    private String planStartData;
+
+    public String getPlanStartData() {
+        return planStartData;
+    }
+
+    public void setPlanStartData(String planStartData) {
+        this.planStartData = planStartData;
+    }
+
+
     public List<TTsLjplanContent> getContents() {
         return contents;
     }

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

@@ -130,6 +130,17 @@ public class TTsYsplan extends BaseEntity
 
     private List<TTsYsplanContent> contents;
 
+    private String planStartData;
+
+    public String getPlanStartData() {
+        return planStartData;
+    }
+
+    public void setPlanStartData(String planStartData) {
+        this.planStartData = planStartData;
+    }
+
+
     public List<TTsYsplanContent> getContents() {
         return contents;
     }

ui/src/api/training/bccnew/flPlan.js

@@ -50,4 +50,4 @@ export function exportFlPlan(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/training/bccnew/flplandsdt.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询分离培训列表
 export function listFlplandsdt(query) {
   return request({
-    url: '/bccnew/flplandsdt/list',
+    url: '/bccnew/flplandsdt/listAll',
     method: 'get',
     params: query
   })

ui/src/api/training/bccnew/ftPlan.js

@@ -50,4 +50,4 @@ export function exportFtPlan(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/training/bccnew/ftplandsdt.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询芳烃培训列表
 export function listFtplandsdt(query) {
   return request({
-    url: '/bccnew/ftplandsdt/list',
+    url: '/bccnew/ftplandsdt/listAll',
     method: 'get',
     params: query
   })

ui/src/api/training/bccnew/ljPlan.js

@@ -50,4 +50,4 @@ export function exportLjPlan(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/training/bccnew/ljplandsdt.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询裂解培训列表
 export function listLjplandsdt(query) {
   return request({
-    url: '/bccnew/ljplandsdt/list',
+    url: '/bccnew/ljplandsdt/listAll',
     method: 'get',
     params: query
   })

ui/src/api/training/bccnew/ysplandsdt.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询转岗培训列表
 export function listYsplandsdt(query) {
   return request({
-    url: '/bccnew/ysplandsdt/list',
+    url: '/bccnew/ysplandsdt/listAll',
     method: 'get',
     params: query
   })