导师带徒 修改培训内容

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

@@ -38,11 +38,9 @@ public class TTsFlplanContentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bccnew:flContent:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TTsFlplanContent tTsFlplanContent)
+    public AjaxResult list(TTsFlplanContent tTsFlplanContent)
     {
-        startPage();
-        List<TTsFlplanContent> list = tTsFlplanContentService.selectTTsFlplanContentList(tTsFlplanContent);
-        return getDataTable(list);
+        return AjaxResult.success(tTsFlplanContentService.selectTTsFlplanContentList(tTsFlplanContent));
     }
 
     /**

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

@@ -9,11 +9,11 @@ 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.service.ITTsApproveService;
-import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsFlplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsNewService;
+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.*;
 
@@ -31,6 +31,8 @@ public class TTsFlplanController extends BaseController {
     @Autowired
     private ITTsFlplanService tTsFlplanService;
     @Autowired
+    private ITTsFlplanContentService tTsFlplanContentService;
+    @Autowired
     private ITTsNewService tTsNewService;
     @Autowired
     private ISysUserService sysUserService;
@@ -74,7 +76,14 @@ public class TTsFlplanController extends BaseController {
     @Log(title = "分离培训", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTsFlplan tTsFlplan) {
-        return toAjax(tTsFlplanService.insertTTsFlplan(tTsFlplan));
+        int i = tTsFlplanService.insertTTsFlplan(tTsFlplan);
+        if (CollectionUtils.isNotEmpty(tTsFlplan.getContents())){
+            for (TTsFlplanContent content : tTsFlplan.getContents()) {
+                content.setPid(tTsFlplan.getId());
+                tTsFlplanContentService.insertTTsFlplanContent(content);
+            }
+        }
+        return toAjax(i);
     }
 
 
@@ -106,6 +115,16 @@ public class TTsFlplanController extends BaseController {
     @Log(title = "分离培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFlplan tTsFlplan) {
+        if (CollectionUtils.isNotEmpty(tTsFlplan.getContents())){
+            for (TTsFlplanContent content : tTsFlplan.getContents()) {
+                if (content.getId()==null) {
+                    content.setPid(tTsFlplan.getId());
+                    tTsFlplanContentService.insertTTsFlplanContent(content);
+                }else {
+                    tTsFlplanContentService.updateTTsFlplanContent(content);
+                }
+            }
+        }
         if ("好".equals(tTsFlplan.getScore1())) {
             tTsFlplan.setPlanStatus(5L);
         }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.controller;
 
 import java.util.List;
+
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanContent;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,11 +40,9 @@ public class TTsFtplanContentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bccnew:ftContent:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TTsFtplanContent tTsFtplanContent)
+    public AjaxResult list(TTsFtplanContent tTsFtplanContent)
     {
-        startPage();
-        List<TTsFtplanContent> list = tTsFtplanContentService.selectTTsFtplanContentList(tTsFtplanContent);
-        return getDataTable(list);
+        return AjaxResult.success(tTsFtplanContentService.selectTTsFtplanContentList(tTsFtplanContent));
     }
 
     /**

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

@@ -8,13 +8,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.TTsFlplan;
-import com.ruoyi.project.training.bccnew.domain.TTsFtplan;
-import com.ruoyi.project.training.bccnew.domain.TTsNew;
-import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
-import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsFtplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsNewService;
+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.*;
 
@@ -32,6 +28,8 @@ public class TTsFtplanController extends BaseController {
     @Autowired
     private ITTsFtplanService tTsFtplanService;
     @Autowired
+    private ITTsFtplanContentService tTsFtplanContentService;
+    @Autowired
     private ITTsNewService tTsNewService;
     @Autowired
     private ISysUserService sysUserService;
@@ -75,7 +73,14 @@ public class TTsFtplanController extends BaseController {
     @Log(title = "芳烃培训", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTsFtplan tTsFtplan) {
-        return toAjax(tTsFtplanService.insertTTsFtplan(tTsFtplan));
+        int i = tTsFtplanService.insertTTsFtplan(tTsFtplan);
+        if (CollectionUtils.isNotEmpty(tTsFtplan.getContents())){
+            for (TTsFtplanContent content : tTsFtplan.getContents()) {
+                content.setPid(tTsFtplan.getId());
+                tTsFtplanContentService.insertTTsFtplanContent(content);
+            }
+        }
+        return toAjax(i);
     }
 
     @Log(title = "芳烃培训", businessType = BusinessType.UPDATE)
@@ -106,6 +111,16 @@ public class TTsFtplanController extends BaseController {
     @Log(title = "芳烃培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFtplan tTsFtplan) {
+        if (CollectionUtils.isNotEmpty(tTsFtplan.getContents())){
+            for (TTsFtplanContent content : tTsFtplan.getContents()) {
+                if (content.getId()==null) {
+                    content.setPid(tTsFtplan.getId());
+                    tTsFtplanContentService.insertTTsFtplanContent(content);
+                }else {
+                    tTsFtplanContentService.updateTTsFtplanContent(content);
+                }
+            }
+        }
         if ("好".equals(tTsFtplan.getScore1())) {
             tTsFtplan.setPlanStatus(5L);
         }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.controller;
 
 import java.util.List;
+
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanContent;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,11 +40,9 @@ public class TTsLjplanContentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bccnew:ljContent:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TTsLjplanContent tTsLjplanContent)
+    public AjaxResult list(TTsLjplanContent tTsLjplanContent)
     {
-        startPage();
-        List<TTsLjplanContent> list = tTsLjplanContentService.selectTTsLjplanContentList(tTsLjplanContent);
-        return getDataTable(list);
+        return AjaxResult.success(tTsLjplanContentService.selectTTsLjplanContentList(tTsLjplanContent));
     }
 
     /**

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

@@ -8,13 +8,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.TTsFlplan;
-import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
-import com.ruoyi.project.training.bccnew.domain.TTsNew;
-import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
-import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsLjplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsNewService;
+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.*;
 
@@ -32,6 +28,8 @@ public class TTsLjplanController extends BaseController {
     @Autowired
     private ITTsLjplanService tTsLjplanService;
     @Autowired
+    private ITTsLjplanContentService tTsLjplanContentService;
+    @Autowired
     private ITTsNewService tTsNewService;
     @Autowired
     private ISysUserService sysUserService;
@@ -75,7 +73,14 @@ public class TTsLjplanController extends BaseController {
     @Log(title = "裂解培训", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTsLjplan tTsLjplan) {
-        return toAjax(tTsLjplanService.insertTTsLjplan(tTsLjplan));
+        int i = tTsLjplanService.insertTTsLjplan(tTsLjplan);
+        if (CollectionUtils.isNotEmpty(tTsLjplan.getContents())){
+            for (TTsLjplanContent content : tTsLjplan.getContents()) {
+                content.setPid(tTsLjplan.getId());
+                tTsLjplanContentService.insertTTsLjplanContent(content);
+            }
+        }
+        return toAjax(i);
     }
 
     /**
@@ -110,6 +115,16 @@ public class TTsLjplanController extends BaseController {
     @Log(title = "裂解培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsLjplan tTsLjplan) {
+        if (CollectionUtils.isNotEmpty(tTsLjplan.getContents())){
+            for (TTsLjplanContent content : tTsLjplan.getContents()) {
+                if (content.getId()==null) {
+                    content.setPid(tTsLjplan.getId());
+                    tTsLjplanContentService.insertTTsLjplanContent(content);
+                }else {
+                    tTsLjplanContentService.updateTTsLjplanContent(content);
+                }
+            }
+        }
         if ("好".equals(tTsLjplan.getScore1())) {
             tTsLjplan.setPlanStatus(5L);
         }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.controller;
 
 import java.util.List;
+
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanContent;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,11 +40,9 @@ public class TTsYsplanContentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bccnew:ysContent:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TTsYsplanContent tTsYsplanContent)
+    public AjaxResult list(TTsYsplanContent tTsYsplanContent)
     {
-        startPage();
-        List<TTsYsplanContent> list = tTsYsplanContentService.selectTTsYsplanContentList(tTsYsplanContent);
-        return getDataTable(list);
+        return AjaxResult.success(tTsYsplanContentService.selectTTsYsplanContentList(tTsYsplanContent));
     }
 
     /**

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

@@ -8,13 +8,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.TTsFlplan;
-import com.ruoyi.project.training.bccnew.domain.TTsNew;
-import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
-import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
-import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
-import com.ruoyi.project.training.bccnew.service.ITTsNewService;
-import com.ruoyi.project.training.bccnew.service.ITTsYsplanService;
+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.*;
 
@@ -32,6 +28,8 @@ public class TTsYsplanController extends BaseController {
     @Autowired
     private ITTsYsplanService tTsYsplanService;
     @Autowired
+    private ITTsYsplanContentService tTsYsplanContentService;
+    @Autowired
     private ITTsNewService tTsNewService;
     @Autowired
     private ISysUserService sysUserService;
@@ -75,7 +73,14 @@ public class TTsYsplanController extends BaseController {
     @Log(title = "转岗培训", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTsYsplan tTsYsplan) {
-        return toAjax(tTsYsplanService.insertTTsYsplan(tTsYsplan));
+        int i = tTsYsplanService.insertTTsYsplan(tTsYsplan);
+        if (CollectionUtils.isNotEmpty(tTsYsplan.getContents())){
+            for (TTsYsplanContent content : tTsYsplan.getContents()) {
+                content.setPid(tTsYsplan.getId());
+                tTsYsplanContentService.insertTTsYsplanContent(content);
+            }
+        }
+        return toAjax(i);
     }
 
 
@@ -107,6 +112,16 @@ public class TTsYsplanController extends BaseController {
     @Log(title = "转岗培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsYsplan tTsYsplan) {
+        if (CollectionUtils.isNotEmpty(tTsYsplan.getContents())){
+            for (TTsYsplanContent content : tTsYsplan.getContents()) {
+                if (content.getId()==null) {
+                    content.setPid(tTsYsplan.getId());
+                    tTsYsplanContentService.insertTTsYsplanContent(content);
+                }else {
+                    tTsYsplanContentService.updateTTsYsplanContent(content);
+                }
+            }
+        }
         if ("好".equals(tTsYsplan.getScore1())) {
             tTsYsplan.setPlanStatus(5L);
         }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -118,13 +120,23 @@ public class TTsFlplan extends BaseEntity
 
     private Double timerNeed;
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    private Date planData;
+    private Date planDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date planEndData;
 
     private Long sortTmpl;
 
+    private List<TTsFlplanContent> contents;
+
+    public List<TTsFlplanContent> getContents() {
+        return contents;
+    }
+
+    public void setContents(List<TTsFlplanContent> contents) {
+        this.contents = contents;
+    }
+
     public Long getSortTmpl() {
         return sortTmpl;
     }
@@ -133,12 +145,12 @@ public class TTsFlplan extends BaseEntity
         this.sortTmpl = sortTmpl;
     }
 
-    public Date getPlanData() {
-        return planData;
+    public Date getPlanDate() {
+        return planDate;
     }
 
-    public void setPlanData(Date planData) {
-        this.planData = planData;
+    public void setPlanDate(Date planDate) {
+        this.planDate = planDate;
     }
 
     public Date getPlanEndData() {

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

@@ -27,7 +27,7 @@ public class TTsFlplanContent extends BaseEntity
     /** 计划培训日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "计划培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date planData;
+    private Date planDate;
 
     /** 培训内容 */
     @Excel(name = "培训内容")
@@ -88,14 +88,14 @@ public class TTsFlplanContent extends BaseEntity
     {
         return pid;
     }
-    public void setPlanData(Date planData)
+    public void setPlanDate(Date planDate)
     {
-        this.planData = planData;
+        this.planDate = planDate;
     }
 
-    public Date getPlanData()
+    public Date getPlanDate()
     {
-        return planData;
+        return planDate;
     }
     public void setContent(String content)
     {
@@ -193,7 +193,7 @@ public class TTsFlplanContent extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("pid", getPid())
-            .append("planData", getPlanData())
+            .append("planDate", getPlanDate())
             .append("content", getContent())
             .append("courseDay", getCourseDay())
             .append("delFlag", getDelFlag())

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -118,13 +120,23 @@ public class TTsFtplan extends BaseEntity
 
     private Double timerNeed;
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    private Date planData;
+    private Date planDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date planEndData;
 
     private Long sortTmpl;
 
+    private List<TTsFtplanContent> contents;
+
+    public List<TTsFtplanContent> getContents() {
+        return contents;
+    }
+
+    public void setContents(List<TTsFtplanContent> contents) {
+        this.contents = contents;
+    }
+
     public Long getSortTmpl() {
         return sortTmpl;
     }
@@ -133,12 +145,12 @@ public class TTsFtplan extends BaseEntity
         this.sortTmpl = sortTmpl;
     }
 
-    public Date getPlanData() {
-        return planData;
+    public Date getPlanDate() {
+        return planDate;
     }
 
-    public void setPlanData(Date planData) {
-        this.planData = planData;
+    public void setPlanDate(Date planDate) {
+        this.planDate = planDate;
     }
 
     public Date getPlanEndData() {

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

@@ -27,7 +27,7 @@ public class TTsFtplanContent extends BaseEntity
     /** 计划培训日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "计划培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date planData;
+    private Date planDate;
 
     /** 培训内容 */
     @Excel(name = "培训内容")
@@ -88,14 +88,14 @@ public class TTsFtplanContent extends BaseEntity
     {
         return pid;
     }
-    public void setPlanData(Date planData)
+    public void setPlanDate(Date planDate)
     {
-        this.planData = planData;
+        this.planDate = planDate;
     }
 
-    public Date getPlanData()
+    public Date getPlanDate()
     {
-        return planData;
+        return planDate;
     }
     public void setContent(String content)
     {
@@ -193,7 +193,7 @@ public class TTsFtplanContent extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("pid", getPid())
-            .append("planData", getPlanData())
+            .append("planDate", getPlanDate())
             .append("content", getContent())
             .append("courseDay", getCourseDay())
             .append("delFlag", getDelFlag())

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -118,13 +120,23 @@ public class TTsLjplan extends BaseEntity
 
     private Double timerNeed;
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    private Date planData;
+    private Date planDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date planEndData;
 
     private Long sortTmpl;
 
+    private List<TTsLjplanContent> contents;
+
+    public List<TTsLjplanContent> getContents() {
+        return contents;
+    }
+
+    public void setContents(List<TTsLjplanContent> contents) {
+        this.contents = contents;
+    }
+
     public Long getSortTmpl() {
         return sortTmpl;
     }
@@ -133,12 +145,12 @@ public class TTsLjplan extends BaseEntity
         this.sortTmpl = sortTmpl;
     }
 
-    public Date getPlanData() {
-        return planData;
+    public Date getPlanDate() {
+        return planDate;
     }
 
-    public void setPlanData(Date planData) {
-        this.planData = planData;
+    public void setPlanDate(Date planDate) {
+        this.planDate = planDate;
     }
 
     public Date getPlanEndData() {

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

@@ -27,7 +27,7 @@ public class TTsLjplanContent extends BaseEntity
     /** 计划培训日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "计划培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date planData;
+    private Date planDate;
 
     /** 培训内容 */
     @Excel(name = "培训内容")
@@ -88,14 +88,14 @@ public class TTsLjplanContent extends BaseEntity
     {
         return pid;
     }
-    public void setPlanData(Date planData)
+    public void setPlanDate(Date planDate)
     {
-        this.planData = planData;
+        this.planDate = planDate;
     }
 
-    public Date getPlanData()
+    public Date getPlanDate()
     {
-        return planData;
+        return planDate;
     }
     public void setContent(String content)
     {
@@ -193,7 +193,7 @@ public class TTsLjplanContent extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("pid", getPid())
-            .append("planData", getPlanData())
+            .append("planDate", getPlanDate())
             .append("content", getContent())
             .append("courseDay", getCourseDay())
             .append("delFlag", getDelFlag())

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.bccnew.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -119,13 +121,23 @@ public class TTsYsplan extends BaseEntity
     private Double timerNeed;
 
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    private Date planData;
+    private Date planDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date planEndData;
 
     private Long sortTmpl;
 
+    private List<TTsYsplanContent> contents;
+
+    public List<TTsYsplanContent> getContents() {
+        return contents;
+    }
+
+    public void setContents(List<TTsYsplanContent> contents) {
+        this.contents = contents;
+    }
+
     public Long getSortTmpl() {
         return sortTmpl;
     }
@@ -134,12 +146,12 @@ public class TTsYsplan extends BaseEntity
         this.sortTmpl = sortTmpl;
     }
 
-    public Date getPlanData() {
-        return planData;
+    public Date getPlanDate() {
+        return planDate;
     }
 
-    public void setPlanData(Date planData) {
-        this.planData = planData;
+    public void setPlanDate(Date planDate) {
+        this.planDate = planDate;
     }
 
     public Date getPlanEndData() {

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

@@ -27,7 +27,7 @@ public class TTsYsplanContent extends BaseEntity
     /** 计划培训日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "计划培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date planData;
+    private Date planDate;
 
     /** 培训内容 */
     @Excel(name = "培训内容")
@@ -88,14 +88,14 @@ public class TTsYsplanContent extends BaseEntity
     {
         return pid;
     }
-    public void setPlanData(Date planData)
+    public void setPlanDate(Date planDate)
     {
-        this.planData = planData;
+        this.planDate = planDate;
     }
 
-    public Date getPlanData()
+    public Date getPlanDate()
     {
-        return planData;
+        return planDate;
     }
     public void setContent(String content)
     {
@@ -193,7 +193,7 @@ public class TTsYsplanContent extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("pid", getPid())
-            .append("planData", getPlanData())
+            .append("planDate", getPlanDate())
             .append("content", getContent())
             .append("courseDay", getCourseDay())
             .append("delFlag", getDelFlag())

master/src/main/resources/mybatis/training/bccnew/TTsFlplanContentMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TTsFlplanContent" id="TTsFlplanContentResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="content"    column="content"    />
         <result property="courseDay"    column="course_day"    />
         <result property="delFlag"    column="del_flag"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTsFlplanContentVo">
-        select d.id, d.pid, d.plan_data, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_flplan_content d
+        select d.id, d.pid, d.plan_date, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_flplan_content d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTsFlplanContentVo"/>
         <where>  
             <if test="pid != null "> and pid = #{pid}</if>
-            <if test="planData != null "> and plan_data = #{planData}</if>
+            <if test="planDate != null "> and plan_date = #{planDate}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="courseDay != null  and courseDay != ''"> and course_day = #{courseDay}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="pid != null">pid,</if>
-            <if test="planData != null">plan_data,</if>
+            <if test="planDate != null">plan_date,</if>
             <if test="content != null">content,</if>
             <if test="courseDay != null">course_day,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="pid != null">#{pid},</if>
-            <if test="planData != null">#{planData},</if>
+            <if test="planDate != null">#{planDate},</if>
             <if test="content != null">#{content},</if>
             <if test="courseDay != null">#{courseDay},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_ts_flplan_content
         <trim prefix="SET" suffixOverrides=",">
             <if test="pid != null">pid = #{pid},</if>
-            <if test="planData != null">plan_data = #{planData},</if>
+            <if test="planDate != null">plan_date = #{planDate},</if>
             <if test="content != null">content = #{content},</if>
             <if test="courseDay != null">course_day = #{courseDay},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

master/src/main/resources/mybatis/training/bccnew/TTsFlplanMapper.xml

@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="timer" column="timer" />
         <result property="timerNeed" column="timer_need" />
         <result property="sortTmpl"    column="sort_tmpl"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="planEndData"    column="plan_end_data"    />
     </resultMap>
 
     <sql id="selectTTsFlplanVo">
-        select c.plan_data,d.sort_tmpl,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,d.file_url,d.file_name,d.timer,d.timer_need,s.dept_name from t_ts_flplan d
+        select c.plan_date,d.sort_tmpl,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,d.file_url,d.file_name,d.timer,d.timer_need,s.dept_name from t_ts_flplan d
       left join sys_dept s on s.dept_id = d.dept_id
       left join t_ts_flplan_content c on d.id=c.pid
     </sql>

master/src/main/resources/mybatis/training/bccnew/TTsFtplanContentMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TTsFtplanContent" id="TTsFtplanContentResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="content"    column="content"    />
         <result property="courseDay"    column="course_day"    />
         <result property="delFlag"    column="del_flag"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTsFtplanContentVo">
-        select d.id, d.pid, d.plan_data, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_ftplan_content d
+        select d.id, d.pid, d.plan_date, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_ftplan_content d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTsFtplanContentVo"/>
         <where>  
             <if test="pid != null "> and pid = #{pid}</if>
-            <if test="planData != null "> and plan_data = #{planData}</if>
+            <if test="planDate != null "> and plan_date = #{planDate}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="courseDay != null  and courseDay != ''"> and course_day = #{courseDay}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="pid != null">pid,</if>
-            <if test="planData != null">plan_data,</if>
+            <if test="planDate != null">plan_date,</if>
             <if test="content != null">content,</if>
             <if test="courseDay != null">course_day,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="pid != null">#{pid},</if>
-            <if test="planData != null">#{planData},</if>
+            <if test="planDate != null">#{planDate},</if>
             <if test="content != null">#{content},</if>
             <if test="courseDay != null">#{courseDay},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_ts_ftplan_content
         <trim prefix="SET" suffixOverrides=",">
             <if test="pid != null">pid = #{pid},</if>
-            <if test="planData != null">plan_data = #{planData},</if>
+            <if test="planDate != null">plan_date = #{planDate},</if>
             <if test="content != null">content = #{content},</if>
             <if test="courseDay != null">course_day = #{courseDay},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

master/src/main/resources/mybatis/training/bccnew/TTsFtplanMapper.xml

@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="timer" column="timer" />
         <result property="timerNeed" column="timer_need" />
         <result property="sortTmpl"    column="sort_tmpl"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="planEndData"    column="plan_end_data"    />
     </resultMap>
 
     <sql id="selectTTsFtplanVo">
-        select c.plan_data,d.plan_end_data,d.sort_tmpl,d.file_url,d.file_name,d.timer,d.timer_need,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,s.dept_name from t_ts_ftplan d
+        select c.plan_date,d.plan_end_data,d.sort_tmpl,d.file_url,d.file_name,d.timer,d.timer_need,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,s.dept_name from t_ts_ftplan d
       left join sys_dept s on s.dept_id = d.dept_id
       left join t_ts_ftplan_content c on d.id=c.pid
     </sql>

master/src/main/resources/mybatis/training/bccnew/TTsLjplanContentMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TTsLjplanContent" id="TTsLjplanContentResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="content"    column="content"    />
         <result property="courseDay"    column="course_day"    />
         <result property="delFlag"    column="del_flag"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTsLjplanContentVo">
-        select d.id, d.pid, d.plan_data, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_ljplan_content d
+        select d.id, d.pid, d.plan_date, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_ljplan_content d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTsLjplanContentVo"/>
         <where>  
             <if test="pid != null "> and pid = #{pid}</if>
-            <if test="planData != null "> and plan_data = #{planData}</if>
+            <if test="planDate != null "> and plan_date = #{planDate}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="courseDay != null  and courseDay != ''"> and course_day = #{courseDay}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="pid != null">pid,</if>
-            <if test="planData != null">plan_data,</if>
+            <if test="planDate != null">plan_date,</if>
             <if test="content != null">content,</if>
             <if test="courseDay != null">course_day,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="pid != null">#{pid},</if>
-            <if test="planData != null">#{planData},</if>
+            <if test="planDate != null">#{planDate},</if>
             <if test="content != null">#{content},</if>
             <if test="courseDay != null">#{courseDay},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_ts_ljplan_content
         <trim prefix="SET" suffixOverrides=",">
             <if test="pid != null">pid = #{pid},</if>
-            <if test="planData != null">plan_data = #{planData},</if>
+            <if test="planDate != null">plan_date = #{planDate},</if>
             <if test="content != null">content = #{content},</if>
             <if test="courseDay != null">course_day = #{courseDay},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

master/src/main/resources/mybatis/training/bccnew/TTsLjplanMapper.xml

@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="timer" column="timer" />
         <result property="timerNeed" column="timer_need" />
         <result property="sortTmpl"    column="sort_tmpl"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="planEndData"    column="plan_end_data"    />
     </resultMap>
 
     <sql id="selectTTsLjplanVo">
-        select d.plan_start_data,d.plan_end_data,d.sort_tmpl,d.file_url,d.file_name,d.timer,d.timer_need,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,s.dept_name from t_ts_ljplan d
+        select c.plan_date,d.plan_end_data,d.sort_tmpl,d.file_url,d.file_name,d.timer,d.timer_need,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,s.dept_name from t_ts_ljplan d
       left join sys_dept s on s.dept_id = d.dept_id
       left join t_ts_ljplan_content c on d.id=c.pid
     </sql>

master/src/main/resources/mybatis/training/bccnew/TTsYsplanContentMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TTsYsplanContent" id="TTsYsplanContentResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="content"    column="content"    />
         <result property="courseDay"    column="course_day"    />
         <result property="delFlag"    column="del_flag"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTsYsplanContentVo">
-        select d.id, d.pid, d.plan_data, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_ysplan_content d
+        select d.id, d.pid, d.plan_date, d.content, d.course_day, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.sort_tmpl ,s.dept_name from t_ts_ysplan_content d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTsYsplanContentVo"/>
         <where>  
             <if test="pid != null "> and pid = #{pid}</if>
-            <if test="planData != null "> and plan_data = #{planData}</if>
+            <if test="planDate != null "> and plan_date = #{planDate}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="courseDay != null  and courseDay != ''"> and course_day = #{courseDay}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="pid != null">pid,</if>
-            <if test="planData != null">plan_data,</if>
+            <if test="planDate != null">plan_date,</if>
             <if test="content != null">content,</if>
             <if test="courseDay != null">course_day,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="pid != null">#{pid},</if>
-            <if test="planData != null">#{planData},</if>
+            <if test="planDate != null">#{planDate},</if>
             <if test="content != null">#{content},</if>
             <if test="courseDay != null">#{courseDay},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_ts_ysplan_content
         <trim prefix="SET" suffixOverrides=",">
             <if test="pid != null">pid = #{pid},</if>
-            <if test="planData != null">plan_data = #{planData},</if>
+            <if test="planDate != null">plan_date = #{planDate},</if>
             <if test="content != null">content = #{content},</if>
             <if test="courseDay != null">course_day = #{courseDay},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

master/src/main/resources/mybatis/training/bccnew/TTsYsplanMapper.xml

@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="timer" column="timer" />
         <result property="timerNeed" column="timer_need" />
         <result property="sortTmpl"    column="sort_tmpl"    />
-        <result property="planData"    column="plan_data"    />
+        <result property="planDate"    column="plan_date"    />
         <result property="planEndData"    column="plan_end_data"    />
     </resultMap>
 
     <sql id="selectTTsYsplanVo">
-        select c.plan_data,d.plan_end_data,d.sort_tmpl,d.file_url,d.file_name,d.timer,d.timer_need,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,s.dept_name from t_ts_ysplan d
+        select c.plan_date,d.plan_end_data,d.sort_tmpl,d.file_url,d.file_name,d.timer,d.timer_need,d.id, d.new_id, d.course_code, d.topic, c.content, c.course_day, d.course_hour, d.detail_plan, d.trainer, d.course_date, d.assess, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.plan_status, d.score_1, d.score_2, d.score_3 ,s.dept_name from t_ts_ysplan d
       left join sys_dept s on s.dept_id = d.dept_id
       left join t_ts_ysplan_content c on d.id=c.pid
     </sql>

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询分离培训内容列表
+export function listFlContent(query) {
+  return request({
+    url: '/bccnew/flContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分离培训内容详细
+export function getFlContent(id) {
+  return request({
+    url: '/bccnew/flContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增分离培训内容
+export function addFlContent(data) {
+  return request({
+    url: '/bccnew/flContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分离培训内容
+export function updateFlContent(data) {
+  return request({
+    url: '/bccnew/flContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分离培训内容
+export function delFlContent(id) {
+  return request({
+    url: '/bccnew/flContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出分离培训内容
+export function exportFlContent(query) {
+  return request({
+    url: '/bccnew/flContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询分离培训模版内容列表
+export function listFlTmplContent(query) {
+  return request({
+    url: '/bccnew/flTmplContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分离培训模版内容详细
+export function getFlTmplContent(id) {
+  return request({
+    url: '/bccnew/flTmplContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增分离培训模版内容
+export function addFlTmplContent(data) {
+  return request({
+    url: '/bccnew/flTmplContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分离培训模版内容
+export function updateFlTmplContent(data) {
+  return request({
+    url: '/bccnew/flTmplContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分离培训模版内容
+export function delFlTmplContent(id) {
+  return request({
+    url: '/bccnew/flTmplContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出分离培训模版内容
+export function exportFlTmplContent(query) {
+  return request({
+    url: '/bccnew/flTmplContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询芳烃培训内容列表
+export function listFtContent(query) {
+  return request({
+    url: '/bccnew/ftContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询芳烃培训内容详细
+export function getFtContent(id) {
+  return request({
+    url: '/bccnew/ftContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增芳烃培训内容
+export function addFtContent(data) {
+  return request({
+    url: '/bccnew/ftContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改芳烃培训内容
+export function updateFtContent(data) {
+  return request({
+    url: '/bccnew/ftContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除芳烃培训内容
+export function delFtContent(id) {
+  return request({
+    url: '/bccnew/ftContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出芳烃培训内容
+export function exportFtContent(query) {
+  return request({
+    url: '/bccnew/ftContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询芳烃培训模版内容列表
+export function listFtTmplContent(query) {
+  return request({
+    url: '/bccnew/ftTmplContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询芳烃培训模版内容详细
+export function getFtTmplContent(id) {
+  return request({
+    url: '/bccnew/ftTmplContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增芳烃培训模版内容
+export function addFtTmplContent(data) {
+  return request({
+    url: '/bccnew/ftTmplContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改芳烃培训模版内容
+export function updateFtTmplContent(data) {
+  return request({
+    url: '/bccnew/ftTmplContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除芳烃培训模版内容
+export function delFtTmplContent(id) {
+  return request({
+    url: '/bccnew/ftTmplContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出芳烃培训模版内容
+export function exportFtTmplContent(query) {
+  return request({
+    url: '/bccnew/ftTmplContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询裂解培训内容列表
+export function listLjContent(query) {
+  return request({
+    url: '/bccnew/ljContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询裂解培训内容详细
+export function getLjContent(id) {
+  return request({
+    url: '/bccnew/ljContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增裂解培训内容
+export function addLjContent(data) {
+  return request({
+    url: '/bccnew/ljContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改裂解培训内容
+export function updateLjContent(data) {
+  return request({
+    url: '/bccnew/ljContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除裂解培训内容
+export function delLjContent(id) {
+  return request({
+    url: '/bccnew/ljContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出裂解培训内容
+export function exportLjContent(query) {
+  return request({
+    url: '/bccnew/ljContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询裂解培训模版内容列表
+export function listLjTmplContent(query) {
+  return request({
+    url: '/bccnew/ljTmplContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询裂解培训模版内容详细
+export function getLjTmplContent(id) {
+  return request({
+    url: '/bccnew/ljTmplContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增裂解培训模版内容
+export function addLjTmplContent(data) {
+  return request({
+    url: '/bccnew/ljTmplContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改裂解培训模版内容
+export function updateLjTmplContent(data) {
+  return request({
+    url: '/bccnew/ljTmplContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除裂解培训模版内容
+export function delLjTmplContent(id) {
+  return request({
+    url: '/bccnew/ljTmplContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出裂解培训模版内容
+export function exportLjTmplContent(query) {
+  return request({
+    url: '/bccnew/ljTmplContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询压缩培训内容列表
+export function listYsContent(query) {
+  return request({
+    url: '/bccnew/ysContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询压缩培训内容详细
+export function getYsContent(id) {
+  return request({
+    url: '/bccnew/ysContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增压缩培训内容
+export function addYsContent(data) {
+  return request({
+    url: '/bccnew/ysContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改压缩培训内容
+export function updateYsContent(data) {
+  return request({
+    url: '/bccnew/ysContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除压缩培训内容
+export function delYsContent(id) {
+  return request({
+    url: '/bccnew/ysContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出压缩培训内容
+export function exportYsContent(query) {
+  return request({
+    url: '/bccnew/ysContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询转岗培训模版内容列表
+export function listYsTmplContent(query) {
+  return request({
+    url: '/bccnew/ysTmplContent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询转岗培训模版内容详细
+export function getYsTmplContent(id) {
+  return request({
+    url: '/bccnew/ysTmplContent/' + id,
+    method: 'get'
+  })
+}
+
+// 新增转岗培训模版内容
+export function addYsTmplContent(data) {
+  return request({
+    url: '/bccnew/ysTmplContent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改转岗培训模版内容
+export function updateYsTmplContent(data) {
+  return request({
+    url: '/bccnew/ysTmplContent',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除转岗培训模版内容
+export function delYsTmplContent(id) {
+  return request({
+    url: '/bccnew/ysTmplContent/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出转岗培训模版内容
+export function exportYsTmplContent(query) {
+  return request({
+    url: '/bccnew/ysTmplContent/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -38,15 +38,15 @@
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true" width="180"
                        fixed="left"/>
-      <el-table-column label="计划培训开始时间" prop="planData" width="180" align="center" fixed="left">
+      <el-table-column label="计划培训时间" prop="planDate" width="180" align="center" fixed="left">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planData, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true" fixed="left"
                        width="180"/>
       <el-table-column label="培训计划" align="center" prop="courseDay" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训内容" align="center" prop="content" width="280"/>
       <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.planStatus == 2" size="small" type="warning">待考试</el-tag>
@@ -171,6 +171,56 @@
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
+      <el-card v-for="(recordForm, index) in recordForm" :key="index" shadow="always" class="mb8 mt8">
+        <el-form ref="recordForm" :model="recordForm" :rules="rules" label-width="100px">
+          <el-row>
+            <el-col :span="23">
+              <el-form-item label="计划培训时间" prop="planDate">
+                <el-date-picker
+                  v-model="recordForm.planDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="请选择计划培训时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1">
+              <el-tooltip class="item" effect="dark" content="移除本行" placement="top">
+                <el-button
+                  type="text"
+                  @click.prevent="removeDomain(recordForm)"
+                  style="float: right;"
+                >❌
+                </el-button>
+              </el-tooltip>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="23">
+              <el-form-item label="培训计划" prop="courseDay">
+                <el-input v-model="recordForm.courseDay" placeholder="请输入培训计划"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="23">
+              <el-form-item label="培训内容" prop="content">
+                <el-input type="textarea" v-model="recordForm.content" placeholder="请输入培训内容"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+
+      <div class="mb8 mt8">
+        <el-tooltip class="item" effect="dark" content="该按钮会删除所有卡片内容！请谨慎操作！" placement="top">
+          <el-button type="danger" plain @click="resetForm1()" :disabled="finalFlag"><i
+            class="el-icon-refresh-left"></i></el-button>
+        </el-tooltip>
+        <el-button type="success" plain @click="add"><i class="el-icon-plus"></i></el-button>
+        <el-button type="warning" plain @click="reduce" :disabled="flag||finalFlag"><i class="el-icon-minus"></i>
+        </el-button>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -214,7 +264,7 @@
         type="primary"
         icon="el-icon-video-play"
         @click="handleStudy(file.data)"
-      >开始学习
+      >查看附件
       </el-button>
     </el-dialog>
 
@@ -266,18 +316,6 @@
             <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <!--        <el-table-column :label="$t('培训日期')" align="center" prop="pDate"  width="150">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-date-picker-->
-        <!--              v-if="scope.row.isEdit"-->
-        <!--              v-model="scope.row.pDate"-->
-        <!--              type="date"-->
-        <!--              value-format="yyyy-MM-dd"-->
-        <!--              placeholder="日期">-->
-        <!--            </el-date-picker>-->
-        <!--            <span v-else>{{ parseTime(scope.row.pDate, '{y}-{m}-{d}') }}</span>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column :label="$t('操作')" align="center" width="220" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -368,6 +406,10 @@ import {treeselect} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import {getToken} from "@/utils/auth";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
+import {delLjContent, listLjContent} from "@/api/training/bccnew/ljContent";
+import {delFtContent, listFtContent} from "@/api/training/bccnew/ftContent";
+import {delFlContent, listFlContent} from "@/api/training/bccnew/flContent";
+import {delYsContent, listYsContent} from "@/api/training/bccnew/ysContent";
 
 var timer = null;
 export default {
@@ -379,6 +421,9 @@ export default {
   components: {Treeselect},
   data() {
     return {
+      recordForm: [{}],
+      flag: true,
+      finalFlag: false,
       file: {
         open: false,
         data: {}
@@ -470,6 +515,80 @@ export default {
     });
   },
   methods: {
+    resetForm1() {
+      this.recordForm = [{}]
+      this.flags();
+    },
+    // 表单添加一行
+    add() {
+      let arr = {};
+      this.recordForm.push(arr)
+      this.flags();
+    },
+    // 表单减少一行
+    reduce() {
+      this.recordForm.length = this.recordForm.length - 1
+      this.flags()
+    },
+    //删除自身
+    removeDomain(item) {
+      console.log(item)
+      if (!item.id) {
+        //如果子类大于1  可点击删除按钮
+        if (this.recordForm.length > 1) {
+          var index = this.recordForm.indexOf(item)
+          if (index !== -1) {
+            this.recordForm.splice(index, 1)
+          }
+        }
+        this.flags()
+      } else {
+        var index = this.recordForm.indexOf(item)
+        if (this.planType === 1) {
+          this.$confirm('是否确认删除该行？').then(function () {
+            return delLjContent(item.id);
+          }).then(() => {
+            this.msgSuccess("删除成功");
+            this.recordForm.splice(index, 1)
+          })
+        }else if (this.planType === 2) {
+          this.$confirm('是否确认删除该行？').then(function () {
+            return delYsContent(item.id);
+          }).then(() => {
+            this.msgSuccess("删除成功");
+            this.recordForm.splice(index, 1)
+          })
+        }else if (this.planType === 3) {
+          this.$confirm('是否确认删除该行？').then(function () {
+            return delFlContent(item.id);
+          }).then(() => {
+            this.msgSuccess("删除成功");
+            this.recordForm.splice(index, 1)
+          })
+        }else if (this.planType === 4) {
+          this.$confirm('是否确认删除该行？').then(function () {
+            return delFtContent(item.id);
+          }).then(() => {
+            this.msgSuccess("删除成功");
+            this.recordForm.splice(index, 1)
+          })
+        }
+        this.flags()
+      }
+    },
+    // 判断数组长度
+    flags() {
+      //如果小于1则自动添加一行
+      if (this.recordForm.length < 2) {
+        this.flag = true
+      } else if (this.recordForm.length < 1) {
+        this.recordForm.push({});
+      } else {
+        //先赋值为true再赋为false, 不然会没反应
+        this.flag = true
+        this.flag = false
+      }
+    },
     saveScore(row) {
       if (this.planType === 1) {
         this.$confirm('成绩保存后不可修改！请确认成绩为' + ((row.score1Tmp ? row.score1Tmp : row.score2Tmp ? row.score2Tmp : row.score3Tmp) === undefined ? "" : (row.score1Tmp ? row.score1Tmp : row.score2Tmp ? row.score2Tmp : row.score3Tmp)), "警告", {
@@ -762,7 +881,9 @@ export default {
         score3: null
       };
       this.resetForm("form");
-    }, /** 搜索按钮操作 */
+      this.recordForm = [{}]
+    },
+    /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
@@ -828,24 +949,36 @@ export default {
           this.form = response.data;
           this.open = true;
           this.title = "修改课程";
+          listLjContent({pid: id}).then(res => {
+            this.recordForm = res.data;
+          })
         });
       } else if (this.planType == 2) {
         getYsplandsdt(id).then(response => {
           this.form = response.data;
           this.open = true;
           this.title = "修改课程";
+          listYsContent({pid: id}).then(res => {
+            this.recordForm = res.data;
+          })
         });
       } else if (this.planType == 3) {
         getFlplandsdt(id).then(response => {
           this.form = response.data;
           this.open = true;
           this.title = "修改课程";
+          listFlContent({pid: id}).then(res => {
+            this.recordForm = res.data;
+          })
         });
       } else if (this.planType == 4) {
         getFtplandsdt(id).then(response => {
           this.form = response.data;
           this.open = true;
           this.title = "修改课程";
+          listFtContent({pid: id}).then(res => {
+            this.recordForm = res.data;
+          })
         });
       }
     },
@@ -857,6 +990,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.contents = this.recordForm;
           if (this.form.id != null) {
             if (this.planType == 1) {
               updateLjplandsdt(this.form).then(response => {
@@ -917,7 +1051,7 @@ export default {
     //合并单元格
     mergeMethod({row, column, rowIndex, columnIndex}) {
       // console.log(row)
-      if ([1,3, 6, 7, 8, 9, 10, 11, 12, 13, 14].includes(columnIndex)) {
+      if ([1, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14].includes(columnIndex)) {
         const _row = this.setTable(this.dsdtList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {

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

@@ -8,9 +8,9 @@
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true" width="180"
                        fixed="left"/>
-      <el-table-column label="计划培训开始时间" prop="planData" width="180" align="center" fixed="left">
+      <el-table-column label="计划培训开始时间" prop="planDate" width="180" align="center" fixed="left">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planData, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true" fixed="left"