组织保护措施锁选择改为单选

导师带徒

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
+import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 进组培训Controller
+ *
+ * @author ssy
+ * @date 2024-06-17
+ */
+@RestController
+@RequestMapping("/bccnew/firstplan")
+public class TTsFirstplanController extends BaseController
+{
+    @Autowired
+    private ITTsFirstplanService tTsFirstplanService;
+
+    /**
+     * 查询进组培训列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTsFirstplan tTsFirstplan)
+    {
+        startPage();
+        List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出进组培训列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:export')")
+    @Log(title = "进组培训", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsFirstplan tTsFirstplan)
+    {
+        List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
+        ExcelUtil<TTsFirstplan> util = new ExcelUtil<TTsFirstplan>(TTsFirstplan.class);
+        return util.exportExcel(list, "firstplan");
+    }
+
+    /**
+     * 获取进组培训详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsFirstplanService.selectTTsFirstplanById(id));
+    }
+
+    /**
+     * 新增进组培训
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:add')")
+    @Log(title = "进组培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsFirstplan tTsFirstplan)
+    {
+        return toAjax(tTsFirstplanService.insertTTsFirstplan(tTsFirstplan));
+    }
+
+    /**
+     * 修改进组培训
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:edit')")
+    @Log(title = "进组培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsFirstplan tTsFirstplan)
+    {
+        return toAjax(tTsFirstplanService.updateTTsFirstplan(tTsFirstplan));
+    }
+
+    /**
+     * 删除进组培训
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:remove')")
+    @Log(title = "进组培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsFirstplanService.deleteTTsFirstplanByIds(ids));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
+import com.ruoyi.project.training.bccnew.service.ITTsFlplanService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 分离培训Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/flplandsdt")
+public class TTsFlplanController extends BaseController
+{
+    @Autowired
+    private ITTsFlplanService tTsFlplanService;
+
+    /**
+     * 查询分离培训列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TTsFlplan tTsFlplan)
+    {
+        startPage();
+        List<TTsFlplan> list = tTsFlplanService.selectTTsFlplanList(tTsFlplan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出分离培训列表
+     */
+    @Log(title = "分离培训", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsFlplan tTsFlplan)
+    {
+        List<TTsFlplan> list = tTsFlplanService.selectTTsFlplanList(tTsFlplan);
+        ExcelUtil<TTsFlplan> util = new ExcelUtil<TTsFlplan>(TTsFlplan.class);
+        return util.exportExcel(list, "flplandsdt");
+    }
+
+    /**
+     * 获取分离培训详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsFlplanService.selectTTsFlplanById(id));
+    }
+
+    /**
+     * 新增分离培训
+     */
+    @Log(title = "分离培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsFlplan tTsFlplan)
+    {
+        return toAjax(tTsFlplanService.insertTTsFlplan(tTsFlplan));
+    }
+
+    /**
+     * 修改分离培训
+     */
+    @Log(title = "分离培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsFlplan tTsFlplan)
+    {
+        return toAjax(tTsFlplanService.updateTTsFlplan(tTsFlplan));
+    }
+
+    /**
+     * 删除分离培训
+     */
+    @Log(title = "分离培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsFlplanService.deleteTTsFlplanByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsFlplanTmplService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 分离培训模版Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/training/flPlan")
+public class TTsFlplanTmplController extends BaseController
+{
+    @Autowired
+    private ITTsFlplanTmplService tTsFlplanTmplService;
+
+    /**
+     * 查询分离培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:flPlan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        startPage();
+        List<TTsFlplanTmpl> list = tTsFlplanTmplService.selectTTsFlplanTmplList(tTsFlplanTmpl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出分离培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:flPlan:export')")
+    @Log(title = "分离培训模版", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        List<TTsFlplanTmpl> list = tTsFlplanTmplService.selectTTsFlplanTmplList(tTsFlplanTmpl);
+        ExcelUtil<TTsFlplanTmpl> util = new ExcelUtil<TTsFlplanTmpl>(TTsFlplanTmpl.class);
+        return util.exportExcel(list, "flPlan");
+    }
+
+    /**
+     * 获取分离培训模版详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('training:flPlan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsFlplanTmplService.selectTTsFlplanTmplById(id));
+    }
+
+    /**
+     * 新增分离培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('training:flPlan:add')")
+    @Log(title = "分离培训模版", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        return toAjax(tTsFlplanTmplService.insertTTsFlplanTmpl(tTsFlplanTmpl));
+    }
+
+    /**
+     * 修改分离培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('training:flPlan:edit')")
+    @Log(title = "分离培训模版", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        return toAjax(tTsFlplanTmplService.updateTTsFlplanTmpl(tTsFlplanTmpl));
+    }
+
+    /**
+     * 删除分离培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('training:flPlan:remove')")
+    @Log(title = "分离培训模版", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsFlplanTmplService.deleteTTsFlplanTmplByIds(ids));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplan;
+import com.ruoyi.project.training.bccnew.service.ITTsFtplanService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 芳烃培训Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/ftplandsdt")
+public class TTsFtplanController extends BaseController
+{
+    @Autowired
+    private ITTsFtplanService tTsFtplanService;
+
+    /**
+     * 查询芳烃培训列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TTsFtplan tTsFtplan)
+    {
+        startPage();
+        List<TTsFtplan> list = tTsFtplanService.selectTTsFtplanList(tTsFtplan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出芳烃培训列表
+     */
+    @Log(title = "芳烃培训", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsFtplan tTsFtplan)
+    {
+        List<TTsFtplan> list = tTsFtplanService.selectTTsFtplanList(tTsFtplan);
+        ExcelUtil<TTsFtplan> util = new ExcelUtil<TTsFtplan>(TTsFtplan.class);
+        return util.exportExcel(list, "ftplandsdt");
+    }
+
+    /**
+     * 获取芳烃培训详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsFtplanService.selectTTsFtplanById(id));
+    }
+
+    /**
+     * 新增芳烃培训
+     */
+    @Log(title = "芳烃培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsFtplan tTsFtplan)
+    {
+        return toAjax(tTsFtplanService.insertTTsFtplan(tTsFtplan));
+    }
+
+    /**
+     * 修改芳烃培训
+     */
+    @Log(title = "芳烃培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsFtplan tTsFtplan)
+    {
+        return toAjax(tTsFtplanService.updateTTsFtplan(tTsFtplan));
+    }
+
+    /**
+     * 删除芳烃培训
+     */
+    @Log(title = "芳烃培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsFtplanService.deleteTTsFtplanByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsFtplanTmplService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 芳烃培训模版Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/ftPlan")
+public class TTsFtplanTmplController extends BaseController
+{
+    @Autowired
+    private ITTsFtplanTmplService tTsFtplanTmplService;
+
+    /**
+     * 查询芳烃培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ftPlan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        startPage();
+        List<TTsFtplanTmpl> list = tTsFtplanTmplService.selectTTsFtplanTmplList(tTsFtplanTmpl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出芳烃培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ftPlan:export')")
+    @Log(title = "芳烃培训模版", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        List<TTsFtplanTmpl> list = tTsFtplanTmplService.selectTTsFtplanTmplList(tTsFtplanTmpl);
+        ExcelUtil<TTsFtplanTmpl> util = new ExcelUtil<TTsFtplanTmpl>(TTsFtplanTmpl.class);
+        return util.exportExcel(list, "ftPlan");
+    }
+
+    /**
+     * 获取芳烃培训模版详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ftPlan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsFtplanTmplService.selectTTsFtplanTmplById(id));
+    }
+
+    /**
+     * 新增芳烃培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ftPlan:add')")
+    @Log(title = "芳烃培训模版", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        return toAjax(tTsFtplanTmplService.insertTTsFtplanTmpl(tTsFtplanTmpl));
+    }
+
+    /**
+     * 修改芳烃培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ftPlan:edit')")
+    @Log(title = "芳烃培训模版", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        return toAjax(tTsFtplanTmplService.updateTTsFtplanTmpl(tTsFtplanTmpl));
+    }
+
+    /**
+     * 删除芳烃培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ftPlan:remove')")
+    @Log(title = "芳烃培训模版", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsFtplanTmplService.deleteTTsFtplanTmplByIds(ids));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
+import com.ruoyi.project.training.bccnew.service.ITTsLjplanService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 裂解培训Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/ljplandsdt")
+public class TTsLjplanController extends BaseController
+{
+    @Autowired
+    private ITTsLjplanService tTsLjplanService;
+
+    /**
+     * 查询裂解培训列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TTsLjplan tTsLjplan)
+    {
+        startPage();
+        List<TTsLjplan> list = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出裂解培训列表
+     */
+    @Log(title = "裂解培训", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsLjplan tTsLjplan)
+    {
+        List<TTsLjplan> list = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
+        ExcelUtil<TTsLjplan> util = new ExcelUtil<TTsLjplan>(TTsLjplan.class);
+        return util.exportExcel(list, "ljplandsdt");
+    }
+
+    /**
+     * 获取裂解培训详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsLjplanService.selectTTsLjplanById(id));
+    }
+
+    /**
+     * 新增裂解培训
+     */
+    @Log(title = "裂解培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsLjplan tTsLjplan)
+    {
+        return toAjax(tTsLjplanService.insertTTsLjplan(tTsLjplan));
+    }
+
+    /**
+     * 修改裂解培训
+     */
+    @Log(title = "裂解培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsLjplan tTsLjplan)
+    {
+        return toAjax(tTsLjplanService.updateTTsLjplan(tTsLjplan));
+    }
+
+    /**
+     * 删除裂解培训
+     */
+    @Log(title = "裂解培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsLjplanService.deleteTTsLjplanByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsLjplanTmplService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 裂解培训模版Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/ljPlan")
+public class TTsLjplanTmplController extends BaseController
+{
+    @Autowired
+    private ITTsLjplanTmplService tTsLjplanTmplService;
+
+    /**
+     * 查询裂解培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ljPlan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        startPage();
+        List<TTsLjplanTmpl> list = tTsLjplanTmplService.selectTTsLjplanTmplList(tTsLjplanTmpl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出裂解培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ljPlan:export')")
+    @Log(title = "裂解培训模版", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        List<TTsLjplanTmpl> list = tTsLjplanTmplService.selectTTsLjplanTmplList(tTsLjplanTmpl);
+        ExcelUtil<TTsLjplanTmpl> util = new ExcelUtil<TTsLjplanTmpl>(TTsLjplanTmpl.class);
+        return util.exportExcel(list, "ljPlan");
+    }
+
+    /**
+     * 获取裂解培训模版详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ljPlan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsLjplanTmplService.selectTTsLjplanTmplById(id));
+    }
+
+    /**
+     * 新增裂解培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ljPlan:add')")
+    @Log(title = "裂解培训模版", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        return toAjax(tTsLjplanTmplService.insertTTsLjplanTmpl(tTsLjplanTmpl));
+    }
+
+    /**
+     * 修改裂解培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ljPlan:edit')")
+    @Log(title = "裂解培训模版", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        return toAjax(tTsLjplanTmplService.updateTTsLjplanTmpl(tTsLjplanTmpl));
+    }
+
+    /**
+     * 删除裂解培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:ljPlan:remove')")
+    @Log(title = "裂解培训模版", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsLjplanTmplService.deleteTTsLjplanTmplByIds(ids));
+    }
+}

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

@@ -1,24 +1,23 @@
 package com.ruoyi.project.training.bccnew.controller;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.training.bccnew.domain.TTsNew;
-import com.ruoyi.project.training.bccnew.service.ITTsNewService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.training.bccnew.domain.*;
+import com.ruoyi.project.training.bccnew.service.*;
+import com.ruoyi.project.training.newstaff.domain.TTnSchoolplan;
+import com.ruoyi.project.training.newstaff.domain.TTnTransferplan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 导师带徒Controller
@@ -28,20 +27,120 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/bccnew/tsnew")
-public class TTsNewController extends BaseController
-{
+public class TTsNewController extends BaseController {
     @Autowired
     private ITTsNewService tTsNewService;
 
+    @Autowired
+    private ITTsFirstplanService tTsFirstplanService;
+
+    @Autowired
+    private ITTsFirstplanTmplService tTsFirstplanTmplService;
+
+    @Autowired
+    private ITTsLjplanTmplService tTsLjplanTmplService;
+
+    @Autowired
+    private ITTsLjplanService tTsLjplanService;
+
+
+    @Autowired
+    private ITTsYsplanTmplService tTsYsplanTmplService;
+
+    @Autowired
+    private ITTsYsplanService tTsYsplanService;
+
+
+    @Autowired
+    private ITTsFlplanTmplService tTsFlplanTmplService;
+
+    @Autowired
+    private ITTsFlplanService tTsFlplanService;
+
+
+    @Autowired
+    private ITTsFtplanTmplService tTsFtplanTmplService;
+
+    @Autowired
+    private ITTsFtplanService tTsFtplanService;
+
     /**
      * 查询导师带徒列表
      */
     @PreAuthorize("@ss.hasPermi('bccnew:tsnew:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TTsNew tTsNew)
-    {
+    public TableDataInfo list(TTsNew tTsNew) {
         startPage();
         List<TTsNew> list = tTsNewService.selectTTsNewList(tTsNew);
+        //线程池
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
+        for (TTsNew t : list) {
+            executorService.execute(() -> {
+                try {
+                    //岗前培训
+                    TTsFirstplan tTsFirstplan = new TTsFirstplan();
+                    tTsFirstplan.setNewId(t.getNewId());
+                    List<TTsFirstplan> firstplanAll = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
+                    tTsFirstplan.setPlanStatus(1l);
+                    List<TTsFirstplan> firstplanNow = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
+                    Integer firstAll = firstplanAll.size();
+                    Integer firstNow = firstplanNow.size();
+                    Integer secAll = 0;
+                    Integer secNow = 0;
+                    if (t.getPlanType() == 1) {
+                        TTsLjplan tTsLjplan = new TTsLjplan();
+                        tTsLjplan.setNewId(t.getNewId());
+                        List<TTsLjplan> ljPlansAll = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
+                        tTsLjplan.setPlanStatus(1l);
+                        List<TTsLjplan> ljPlansNow = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
+                        secAll = ljPlansAll.size();
+                        secNow = ljPlansNow.size();
+                    } else if (t.getPlanType() == 2) {
+                        TTsYsplan tTsYsplan = new TTsYsplan();
+                        tTsYsplan.setNewId(t.getNewId());
+                        List<TTsYsplan> ysPlansAll = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
+                        tTsYsplan.setPlanStatus(1l);
+                        List<TTsYsplan> ysPlansNow = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
+                        secAll = ysPlansAll.size();
+                        secNow = ysPlansNow.size();
+                    }else if (t.getPlanType() == 3) {
+                        TTsFlplan tTsFlplan = new TTsFlplan();
+                        tTsFlplan.setNewId(t.getNewId());
+                        List<TTsFlplan> flPlansAll = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
+                        tTsFlplan.setPlanStatus(1l);
+                        List<TTsFlplan> flPlansNow = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
+                        secAll = flPlansAll.size();
+                        secNow = flPlansNow.size();
+                    }else if (t.getPlanType() == 4) {
+                        TTsFtplan tTsFtplan = new TTsFtplan();
+                        tTsFtplan.setNewId(t.getNewId());
+                        List<TTsFtplan> ftPlansAll = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
+                        tTsFtplan.setPlanStatus(1l);
+                        List<TTsFtplan> ftPlansNow = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
+                        secAll = ftPlansAll.size();
+                        secNow = ftPlansNow.size();
+                    }
+                    if (secAll + firstAll != 0) {
+                        String finsh = String.valueOf((secNow + firstNow) * 100 / (secAll + firstAll));
+                        t.setPlanFinish(finsh);
+                    } else {
+                        t.setPlanFinish("0");
+                    }
+                } catch (Exception e) {
+                    logger.error("e:", e);
+                } finally {
+                    latch.countDown(); //线程计数
+                }
+            });
+        }
+
+        try {
+            latch.await(); //线程计数完毕后继续执行
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        executorService.shutdown();
         return getDataTable(list);
     }
 
@@ -51,8 +150,7 @@ public class TTsNewController extends BaseController
     @PreAuthorize("@ss.hasPermi('bccnew:tsnew:export')")
     @Log(title = "导师带徒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TTsNew tTsNew)
-    {
+    public AjaxResult export(TTsNew tTsNew) {
         List<TTsNew> list = tTsNewService.selectTTsNewList(tTsNew);
         ExcelUtil<TTsNew> util = new ExcelUtil<TTsNew>(TTsNew.class);
         return util.exportExcel(list, "tsnew");
@@ -63,8 +161,7 @@ public class TTsNewController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bccnew:tsnew:query')")
     @GetMapping(value = "/{newId}")
-    public AjaxResult getInfo(@PathVariable("newId") Long newId)
-    {
+    public AjaxResult getInfo(@PathVariable("newId") Long newId) {
         return AjaxResult.success(tTsNewService.selectTTsNewById(newId));
     }
 
@@ -74,8 +171,7 @@ public class TTsNewController extends BaseController
     @PreAuthorize("@ss.hasPermi('bccnew:tsnew:add')")
     @Log(title = "导师带徒", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TTsNew tTsNew)
-    {
+    public AjaxResult add(@RequestBody TTsNew tTsNew) {
         return toAjax(tTsNewService.insertTTsNew(tTsNew));
     }
 
@@ -85,8 +181,7 @@ public class TTsNewController extends BaseController
     @PreAuthorize("@ss.hasPermi('bccnew:tsnew:edit')")
     @Log(title = "导师带徒", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TTsNew tTsNew)
-    {
+    public AjaxResult edit(@RequestBody TTsNew tTsNew) {
         return toAjax(tTsNewService.updateTTsNew(tTsNew));
     }
 
@@ -95,9 +190,8 @@ public class TTsNewController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bccnew:tsnew:remove')")
     @Log(title = "导师带徒", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{newIds}")
-    public AjaxResult remove(@PathVariable Long[] newIds)
-    {
+    @DeleteMapping("/{newIds}")
+    public AjaxResult remove(@PathVariable Long[] newIds) {
         return toAjax(tTsNewService.deleteTTsNewByIds(newIds));
     }
 }

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
+import com.ruoyi.project.training.bccnew.service.ITTsYsplanService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 转岗培训Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/ysplandsdt")
+public class TTsYsplanController extends BaseController
+{
+    @Autowired
+    private ITTsYsplanService tTsYsplanService;
+
+    /**
+     * 查询转岗培训列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TTsYsplan tTsYsplan)
+    {
+        startPage();
+        List<TTsYsplan> list = tTsYsplanService.selectTTsYsplanList(tTsYsplan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出转岗培训列表
+     */
+    @Log(title = "转岗培训", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsYsplan tTsYsplan)
+    {
+        List<TTsYsplan> list = tTsYsplanService.selectTTsYsplanList(tTsYsplan);
+        ExcelUtil<TTsYsplan> util = new ExcelUtil<TTsYsplan>(TTsYsplan.class);
+        return util.exportExcel(list, "ysplandsdt");
+    }
+
+    /**
+     * 获取转岗培训详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsYsplanService.selectTTsYsplanById(id));
+    }
+
+    /**
+     * 新增转岗培训
+     */
+    @Log(title = "转岗培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsYsplan tTsYsplan)
+    {
+        return toAjax(tTsYsplanService.insertTTsYsplan(tTsYsplan));
+    }
+
+    /**
+     * 修改转岗培训
+     */
+    @Log(title = "转岗培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsYsplan tTsYsplan)
+    {
+        return toAjax(tTsYsplanService.updateTTsYsplan(tTsYsplan));
+    }
+
+    /**
+     * 删除转岗培训
+     */
+    @Log(title = "转岗培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsYsplanService.deleteTTsYsplanByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.bccnew.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsYsplanTmplService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 压缩培训模版Controller
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/bccnew/yaPlan")
+public class TTsYsplanTmplController extends BaseController
+{
+    @Autowired
+    private ITTsYsplanTmplService tTsYsplanTmplService;
+
+    /**
+     * 查询压缩培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:yaPlan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        startPage();
+        List<TTsYsplanTmpl> list = tTsYsplanTmplService.selectTTsYsplanTmplList(tTsYsplanTmpl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出压缩培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:yaPlan:export')")
+    @Log(title = "压缩培训模版", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        List<TTsYsplanTmpl> list = tTsYsplanTmplService.selectTTsYsplanTmplList(tTsYsplanTmpl);
+        ExcelUtil<TTsYsplanTmpl> util = new ExcelUtil<TTsYsplanTmpl>(TTsYsplanTmpl.class);
+        return util.exportExcel(list, "yaPlan");
+    }
+
+    /**
+     * 获取压缩培训模版详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:yaPlan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTsYsplanTmplService.selectTTsYsplanTmplById(id));
+    }
+
+    /**
+     * 新增压缩培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:yaPlan:add')")
+    @Log(title = "压缩培训模版", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        return toAjax(tTsYsplanTmplService.insertTTsYsplanTmpl(tTsYsplanTmpl));
+    }
+
+    /**
+     * 修改压缩培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:yaPlan:edit')")
+    @Log(title = "压缩培训模版", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        return toAjax(tTsYsplanTmplService.updateTTsYsplanTmpl(tTsYsplanTmpl));
+    }
+
+    /**
+     * 删除压缩培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('bccnew:yaPlan:remove')")
+    @Log(title = "压缩培训模版", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTsYsplanTmplService.deleteTTsYsplanTmplByIds(ids));
+    }
+}

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

@@ -0,0 +1,303 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 进组培训对象 t_ts_firstplan
+ *
+ * @author ssy
+ * @date 2024-06-17
+ */
+public class TTsFirstplan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 培训类型 */
+    @Excel(name = "培训类型")
+    private String courseType;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 培训状态 */
+    @Excel(name = "培训状态")
+    private Long planStatus;
+
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setCourseType(String courseType)
+    {
+        this.courseType = courseType;
+    }
+
+    public String getCourseType()
+    {
+        return courseType;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setPlanStatus(Long planStatus)
+    {
+        this.planStatus = planStatus;
+    }
+
+    public Long getPlanStatus()
+    {
+        return planStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("courseType", getCourseType())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("planStatus", getPlanStatus())
+            .toString();
+    }
+}

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

@@ -0,0 +1,346 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 分离培训对象 t_ts_flplan
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsFlplan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 培训状态 */
+    @Excel(name = "培训状态")
+    private Long planStatus;
+
+    /** 第一次成绩 */
+    @Excel(name = "第一次成绩")
+    private String score1;
+
+    /** 第二次成绩 */
+    @Excel(name = "第二次成绩")
+    private String score2;
+
+    /** c */
+    @Excel(name = "第三次成绩")
+    private String score3;
+
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setPlanStatus(Long planStatus)
+    {
+        this.planStatus = planStatus;
+    }
+
+    public Long getPlanStatus()
+    {
+        return planStatus;
+    }
+    public void setScore1(String score1)
+    {
+        this.score1 = score1;
+    }
+
+    public String getScore1()
+    {
+        return score1;
+    }
+    public void setScore2(String score2)
+    {
+        this.score2 = score2;
+    }
+
+    public String getScore2()
+    {
+        return score2;
+    }
+    public void setScore3(String score3)
+    {
+        this.score3 = score3;
+    }
+
+    public String getScore3()
+    {
+        return score3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("planStatus", getPlanStatus())
+            .append("score1", getScore1())
+            .append("score2", getScore2())
+            .append("score3", getScore3())
+            .toString();
+    }
+}

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

@@ -0,0 +1,291 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 分离培训模版对象 t_ts_flplan_tmpl
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsFlplanTmpl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

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

@@ -0,0 +1,346 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 芳烃培训对象 t_ts_ftplan
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsFtplan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 培训状态 */
+    @Excel(name = "培训状态")
+    private Long planStatus;
+
+    /** 第一次成绩 */
+    @Excel(name = "第一次成绩")
+    private String score1;
+
+    /** 第二次成绩 */
+    @Excel(name = "第二次成绩")
+    private String score2;
+
+    /** 第三次成绩 */
+    @Excel(name = "第三次成绩")
+    private String score3;
+
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setPlanStatus(Long planStatus)
+    {
+        this.planStatus = planStatus;
+    }
+
+    public Long getPlanStatus()
+    {
+        return planStatus;
+    }
+    public void setScore1(String score1)
+    {
+        this.score1 = score1;
+    }
+
+    public String getScore1()
+    {
+        return score1;
+    }
+    public void setScore2(String score2)
+    {
+        this.score2 = score2;
+    }
+
+    public String getScore2()
+    {
+        return score2;
+    }
+    public void setScore3(String score3)
+    {
+        this.score3 = score3;
+    }
+
+    public String getScore3()
+    {
+        return score3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("planStatus", getPlanStatus())
+            .append("score1", getScore1())
+            .append("score2", getScore2())
+            .append("score3", getScore3())
+            .toString();
+    }
+}

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

@@ -0,0 +1,291 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 芳烃培训模版对象 t_ts_ftplan_tmpl
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsFtplanTmpl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

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

@@ -0,0 +1,346 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 裂解培训对象 t_ts_ljplan
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsLjplan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 培训状态 */
+    @Excel(name = "培训状态")
+    private Long planStatus;
+
+    /** 第一次成绩 */
+    @Excel(name = "第一次成绩")
+    private String score1;
+
+    /** 第二次成绩 */
+    @Excel(name = "第二次成绩")
+    private String score2;
+
+    /** 第三次成绩 */
+    @Excel(name = "第三次成绩")
+    private String score3;
+
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setPlanStatus(Long planStatus)
+    {
+        this.planStatus = planStatus;
+    }
+
+    public Long getPlanStatus()
+    {
+        return planStatus;
+    }
+    public void setScore1(String score1)
+    {
+        this.score1 = score1;
+    }
+
+    public String getScore1()
+    {
+        return score1;
+    }
+    public void setScore2(String score2)
+    {
+        this.score2 = score2;
+    }
+
+    public String getScore2()
+    {
+        return score2;
+    }
+    public void setScore3(String score3)
+    {
+        this.score3 = score3;
+    }
+
+    public String getScore3()
+    {
+        return score3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("planStatus", getPlanStatus())
+            .append("score1", getScore1())
+            .append("score2", getScore2())
+            .append("score3", getScore3())
+            .toString();
+    }
+}

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

@@ -0,0 +1,291 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 裂解培训模版对象 t_ts_ljplan_tmpl
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsLjplanTmpl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

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

@@ -86,6 +86,16 @@ public class TTsNew extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    private String planFinish;
+
+    public String getPlanFinish() {
+        return planFinish;
+    }
+
+    public void setPlanFinish(String planFinish) {
+        this.planFinish = planFinish;
+    }
+
     public void setNewId(Long newId)
     {
         this.newId = newId;

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

@@ -0,0 +1,346 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 转岗培训对象 t_ts_ysplan
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsYsplan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 培训状态 */
+    @Excel(name = "培训状态")
+    private Long planStatus;
+
+    /** 第一次成绩 */
+    @Excel(name = "第一次成绩")
+    private String score1;
+
+    /** 第二次成绩 */
+    @Excel(name = "第二次成绩")
+    private String score2;
+
+    /** 第三次成绩 */
+    @Excel(name = "第三次成绩")
+    private String score3;
+
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setPlanStatus(Long planStatus)
+    {
+        this.planStatus = planStatus;
+    }
+
+    public Long getPlanStatus()
+    {
+        return planStatus;
+    }
+    public void setScore1(String score1)
+    {
+        this.score1 = score1;
+    }
+
+    public String getScore1()
+    {
+        return score1;
+    }
+    public void setScore2(String score2)
+    {
+        this.score2 = score2;
+    }
+
+    public String getScore2()
+    {
+        return score2;
+    }
+    public void setScore3(String score3)
+    {
+        this.score3 = score3;
+    }
+
+    public String getScore3()
+    {
+        return score3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("planStatus", getPlanStatus())
+            .append("score1", getScore1())
+            .append("score2", getScore2())
+            .append("score3", getScore3())
+            .toString();
+    }
+}

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

@@ -0,0 +1,291 @@
+package com.ruoyi.project.training.bccnew.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 压缩培训模版对象 t_ts_ysplan_tmpl
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+public class TTsYsplanTmpl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private Long newId;
+
+    /** 课程编号 */
+    @Excel(name = "课程编号")
+    private String courseCode;
+
+    /** 培训主题 */
+    @Excel(name = "培训主题")
+    private String topic;
+
+    /** 培训内容 */
+    @Excel(name = "培训内容")
+    private String content;
+
+    /** 培训天 */
+    @Excel(name = "培训天")
+    private Long courseDay;
+
+    /** 培训小时 */
+    @Excel(name = "培训小时")
+    private Long courseHour;
+
+    /** 详细计划 */
+    @Excel(name = "详细计划")
+    private String detailPlan;
+
+    /** 讲师 */
+    @Excel(name = "讲师")
+    private String trainer;
+
+    /** 培训日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date courseDate;
+
+    /** 考核情况 */
+    @Excel(name = "考核情况")
+    private String assess;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setCourseCode(String courseCode)
+    {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseCode()
+    {
+        return courseCode;
+    }
+    public void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+
+    public String getTopic()
+    {
+        return topic;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setCourseDay(Long courseDay)
+    {
+        this.courseDay = courseDay;
+    }
+
+    public Long getCourseDay()
+    {
+        return courseDay;
+    }
+    public void setCourseHour(Long courseHour)
+    {
+        this.courseHour = courseHour;
+    }
+
+    public Long getCourseHour()
+    {
+        return courseHour;
+    }
+    public void setDetailPlan(String detailPlan)
+    {
+        this.detailPlan = detailPlan;
+    }
+
+    public String getDetailPlan()
+    {
+        return detailPlan;
+    }
+    public void setTrainer(String trainer)
+    {
+        this.trainer = trainer;
+    }
+
+    public String getTrainer()
+    {
+        return trainer;
+    }
+    public void setCourseDate(Date courseDate)
+    {
+        this.courseDate = courseDate;
+    }
+
+    public Date getCourseDate()
+    {
+        return courseDate;
+    }
+    public void setAssess(String assess)
+    {
+        this.assess = assess;
+    }
+
+    public String getAssess()
+    {
+        return assess;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("newId", getNewId())
+            .append("courseCode", getCourseCode())
+            .append("topic", getTopic())
+            .append("content", getContent())
+            .append("courseDay", getCourseDay())
+            .append("courseHour", getCourseHour())
+            .append("detailPlan", getDetailPlan())
+            .append("trainer", getTrainer())
+            .append("courseDate", getCourseDate())
+            .append("assess", getAssess())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsFirstplanMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
+
+/**
+ * 进组培训Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-17
+ */
+public interface TTsFirstplanMapper 
+{
+    /**
+     * 查询进组培训
+     * 
+     * @param id 进组培训ID
+     * @return 进组培训
+     */
+    public TTsFirstplan selectTTsFirstplanById(Long id);
+    public List<TTsFirstplan> selectTTsFirstplanListByNewId(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 查询进组培训列表
+     * 
+     * @param tTsFirstplan 进组培训
+     * @return 进组培训集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsFirstplan> selectTTsFirstplanList(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 新增进组培训
+     * 
+     * @param tTsFirstplan 进组培训
+     * @return 结果
+     */
+    public int insertTTsFirstplan(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 修改进组培训
+     * 
+     * @param tTsFirstplan 进组培训
+     * @return 结果
+     */
+    public int updateTTsFirstplan(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 删除进组培训
+     * 
+     * @param id 进组培训ID
+     * @return 结果
+     */
+    public int deleteTTsFirstplanById(Long id);
+
+    /**
+     * 批量删除进组培训
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsFirstplanByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsFlplanMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
+
+/**
+ * 分离培训Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsFlplanMapper 
+{
+    /**
+     * 查询分离培训
+     * 
+     * @param id 分离培训ID
+     * @return 分离培训
+     */
+    public TTsFlplan selectTTsFlplanById(Long id);
+
+    /**
+     * 查询分离培训列表
+     * 
+     * @param tTsFlplan 分离培训
+     * @return 分离培训集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsFlplan> selectTTsFlplanList(TTsFlplan tTsFlplan);
+
+    public List<TTsFlplan> selectTTsFlplanListByNewId(TTsFlplan tTsFlplan);
+
+    /**
+     * 新增分离培训
+     * 
+     * @param tTsFlplan 分离培训
+     * @return 结果
+     */
+    public int insertTTsFlplan(TTsFlplan tTsFlplan);
+
+    /**
+     * 修改分离培训
+     * 
+     * @param tTsFlplan 分离培训
+     * @return 结果
+     */
+    public int updateTTsFlplan(TTsFlplan tTsFlplan);
+
+    /**
+     * 删除分离培训
+     * 
+     * @param id 分离培训ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanById(Long id);
+
+    /**
+     * 批量删除分离培训
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsFlplanTmplMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanTmpl;
+
+/**
+ * 分离培训模版Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsFlplanTmplMapper 
+{
+    /**
+     * 查询分离培训模版
+     * 
+     * @param id 分离培训模版ID
+     * @return 分离培训模版
+     */
+    public TTsFlplanTmpl selectTTsFlplanTmplById(Long id);
+
+    /**
+     * 查询分离培训模版列表
+     * 
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 分离培训模版集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsFlplanTmpl> selectTTsFlplanTmplList(TTsFlplanTmpl tTsFlplanTmpl);
+
+    /**
+     * 新增分离培训模版
+     * 
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 结果
+     */
+    public int insertTTsFlplanTmpl(TTsFlplanTmpl tTsFlplanTmpl);
+
+    /**
+     * 修改分离培训模版
+     * 
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 结果
+     */
+    public int updateTTsFlplanTmpl(TTsFlplanTmpl tTsFlplanTmpl);
+
+    /**
+     * 删除分离培训模版
+     * 
+     * @param id 分离培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanTmplById(Long id);
+
+    /**
+     * 批量删除分离培训模版
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanTmplByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsFtplanMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplan;
+
+/**
+ * 芳烃培训Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsFtplanMapper 
+{
+    /**
+     * 查询芳烃培训
+     * 
+     * @param id 芳烃培训ID
+     * @return 芳烃培训
+     */
+    public TTsFtplan selectTTsFtplanById(Long id);
+
+    /**
+     * 查询芳烃培训列表
+     * 
+     * @param tTsFtplan 芳烃培训
+     * @return 芳烃培训集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsFtplan> selectTTsFtplanList(TTsFtplan tTsFtplan);
+    public List<TTsFtplan> selectTTsFtplanListByNewId(TTsFtplan tTsFtplan);
+
+    /**
+     * 新增芳烃培训
+     * 
+     * @param tTsFtplan 芳烃培训
+     * @return 结果
+     */
+    public int insertTTsFtplan(TTsFtplan tTsFtplan);
+
+    /**
+     * 修改芳烃培训
+     * 
+     * @param tTsFtplan 芳烃培训
+     * @return 结果
+     */
+    public int updateTTsFtplan(TTsFtplan tTsFtplan);
+
+    /**
+     * 删除芳烃培训
+     * 
+     * @param id 芳烃培训ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanById(Long id);
+
+    /**
+     * 批量删除芳烃培训
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsFtplanTmplMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplanTmpl;
+
+/**
+ * 芳烃培训模版Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsFtplanTmplMapper 
+{
+    /**
+     * 查询芳烃培训模版
+     * 
+     * @param id 芳烃培训模版ID
+     * @return 芳烃培训模版
+     */
+    public TTsFtplanTmpl selectTTsFtplanTmplById(Long id);
+
+    /**
+     * 查询芳烃培训模版列表
+     * 
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 芳烃培训模版集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsFtplanTmpl> selectTTsFtplanTmplList(TTsFtplanTmpl tTsFtplanTmpl);
+
+    /**
+     * 新增芳烃培训模版
+     * 
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 结果
+     */
+    public int insertTTsFtplanTmpl(TTsFtplanTmpl tTsFtplanTmpl);
+
+    /**
+     * 修改芳烃培训模版
+     * 
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 结果
+     */
+    public int updateTTsFtplanTmpl(TTsFtplanTmpl tTsFtplanTmpl);
+
+    /**
+     * 删除芳烃培训模版
+     * 
+     * @param id 芳烃培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanTmplById(Long id);
+
+    /**
+     * 批量删除芳烃培训模版
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanTmplByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsLjplanMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
+
+/**
+ * 裂解培训Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsLjplanMapper 
+{
+    /**
+     * 查询裂解培训
+     * 
+     * @param id 裂解培训ID
+     * @return 裂解培训
+     */
+    public TTsLjplan selectTTsLjplanById(Long id);
+
+    /**
+     * 查询裂解培训列表
+     * 
+     * @param tTsLjplan 裂解培训
+     * @return 裂解培训集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsLjplan> selectTTsLjplanList(TTsLjplan tTsLjplan);
+    public List<TTsLjplan> selectTTsLjplanListByNewId(TTsLjplan tTsLjplan);
+
+    /**
+     * 新增裂解培训
+     * 
+     * @param tTsLjplan 裂解培训
+     * @return 结果
+     */
+    public int insertTTsLjplan(TTsLjplan tTsLjplan);
+
+    /**
+     * 修改裂解培训
+     * 
+     * @param tTsLjplan 裂解培训
+     * @return 结果
+     */
+    public int updateTTsLjplan(TTsLjplan tTsLjplan);
+
+    /**
+     * 删除裂解培训
+     * 
+     * @param id 裂解培训ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanById(Long id);
+
+    /**
+     * 批量删除裂解培训
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsLjplanTmplMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplanTmpl;
+
+/**
+ * 裂解培训模版Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsLjplanTmplMapper 
+{
+    /**
+     * 查询裂解培训模版
+     * 
+     * @param id 裂解培训模版ID
+     * @return 裂解培训模版
+     */
+    public TTsLjplanTmpl selectTTsLjplanTmplById(Long id);
+
+    /**
+     * 查询裂解培训模版列表
+     * 
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 裂解培训模版集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsLjplanTmpl> selectTTsLjplanTmplList(TTsLjplanTmpl tTsLjplanTmpl);
+
+    /**
+     * 新增裂解培训模版
+     * 
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 结果
+     */
+    public int insertTTsLjplanTmpl(TTsLjplanTmpl tTsLjplanTmpl);
+
+    /**
+     * 修改裂解培训模版
+     * 
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 结果
+     */
+    public int updateTTsLjplanTmpl(TTsLjplanTmpl tTsLjplanTmpl);
+
+    /**
+     * 删除裂解培训模版
+     * 
+     * @param id 裂解培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanTmplById(Long id);
+
+    /**
+     * 批量删除裂解培训模版
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanTmplByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsYsplanMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
+
+/**
+ * 转岗培训Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsYsplanMapper 
+{
+    /**
+     * 查询转岗培训
+     * 
+     * @param id 转岗培训ID
+     * @return 转岗培训
+     */
+    public TTsYsplan selectTTsYsplanById(Long id);
+
+    /**
+     * 查询转岗培训列表
+     * 
+     * @param tTsYsplan 转岗培训
+     * @return 转岗培训集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsYsplan> selectTTsYsplanList(TTsYsplan tTsYsplan);
+    public List<TTsYsplan> selectTTsYsplanListByNewId(TTsYsplan tTsYsplan);
+
+    /**
+     * 新增转岗培训
+     * 
+     * @param tTsYsplan 转岗培训
+     * @return 结果
+     */
+    public int insertTTsYsplan(TTsYsplan tTsYsplan);
+
+    /**
+     * 修改转岗培训
+     * 
+     * @param tTsYsplan 转岗培训
+     * @return 结果
+     */
+    public int updateTTsYsplan(TTsYsplan tTsYsplan);
+
+    /**
+     * 删除转岗培训
+     * 
+     * @param id 转岗培训ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanById(Long id);
+
+    /**
+     * 批量删除转岗培训
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/bccnew/mapper/TTsYsplanTmplMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.training.bccnew.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplanTmpl;
+
+/**
+ * 压缩培训模版Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface TTsYsplanTmplMapper 
+{
+    /**
+     * 查询压缩培训模版
+     * 
+     * @param id 压缩培训模版ID
+     * @return 压缩培训模版
+     */
+    public TTsYsplanTmpl selectTTsYsplanTmplById(Long id);
+
+    /**
+     * 查询压缩培训模版列表
+     * 
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 压缩培训模版集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTsYsplanTmpl> selectTTsYsplanTmplList(TTsYsplanTmpl tTsYsplanTmpl);
+
+    /**
+     * 新增压缩培训模版
+     * 
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 结果
+     */
+    public int insertTTsYsplanTmpl(TTsYsplanTmpl tTsYsplanTmpl);
+
+    /**
+     * 修改压缩培训模版
+     * 
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 结果
+     */
+    public int updateTTsYsplanTmpl(TTsYsplanTmpl tTsYsplanTmpl);
+
+    /**
+     * 删除压缩培训模版
+     * 
+     * @param id 压缩培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanTmplById(Long id);
+
+    /**
+     * 批量删除压缩培训模版
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanTmplByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
+
+/**
+ * 进组培训Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-17
+ */
+public interface ITTsFirstplanService 
+{
+    /**
+     * 查询进组培训
+     * 
+     * @param id 进组培训ID
+     * @return 进组培训
+     */
+    public TTsFirstplan selectTTsFirstplanById(Long id);
+    public List<TTsFirstplan> selectTTsFirstplanListByNewId(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 查询进组培训列表
+     * 
+     * @param tTsFirstplan 进组培训
+     * @return 进组培训集合
+     */
+    public List<TTsFirstplan> selectTTsFirstplanList(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 新增进组培训
+     * 
+     * @param tTsFirstplan 进组培训
+     * @return 结果
+     */
+    public int insertTTsFirstplan(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 修改进组培训
+     * 
+     * @param tTsFirstplan 进组培训
+     * @return 结果
+     */
+    public int updateTTsFirstplan(TTsFirstplan tTsFirstplan);
+
+    /**
+     * 批量删除进组培训
+     * 
+     * @param ids 需要删除的进组培训ID
+     * @return 结果
+     */
+    public int deleteTTsFirstplanByIds(Long[] ids);
+
+    /**
+     * 删除进组培训信息
+     * 
+     * @param id 进组培训ID
+     * @return 结果
+     */
+    public int deleteTTsFirstplanById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
+
+/**
+ * 分离培训Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsFlplanService 
+{
+    /**
+     * 查询分离培训
+     * 
+     * @param id 分离培训ID
+     * @return 分离培训
+     */
+    public TTsFlplan selectTTsFlplanById(Long id);
+
+    /**
+     * 查询分离培训列表
+     * 
+     * @param tTsFlplan 分离培训
+     * @return 分离培训集合
+     */
+    public List<TTsFlplan> selectTTsFlplanList(TTsFlplan tTsFlplan);
+    public List<TTsFlplan> selectTTsFlplanListByNewId(TTsFlplan tTsFlplan);
+
+    /**
+     * 新增分离培训
+     * 
+     * @param tTsFlplan 分离培训
+     * @return 结果
+     */
+    public int insertTTsFlplan(TTsFlplan tTsFlplan);
+
+    /**
+     * 修改分离培训
+     * 
+     * @param tTsFlplan 分离培训
+     * @return 结果
+     */
+    public int updateTTsFlplan(TTsFlplan tTsFlplan);
+
+    /**
+     * 批量删除分离培训
+     * 
+     * @param ids 需要删除的分离培训ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanByIds(Long[] ids);
+
+    /**
+     * 删除分离培训信息
+     * 
+     * @param id 分离培训ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanTmpl;
+
+/**
+ * 分离培训模版Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsFlplanTmplService 
+{
+    /**
+     * 查询分离培训模版
+     * 
+     * @param id 分离培训模版ID
+     * @return 分离培训模版
+     */
+    public TTsFlplanTmpl selectTTsFlplanTmplById(Long id);
+
+    /**
+     * 查询分离培训模版列表
+     * 
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 分离培训模版集合
+     */
+    public List<TTsFlplanTmpl> selectTTsFlplanTmplList(TTsFlplanTmpl tTsFlplanTmpl);
+
+    /**
+     * 新增分离培训模版
+     * 
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 结果
+     */
+    public int insertTTsFlplanTmpl(TTsFlplanTmpl tTsFlplanTmpl);
+
+    /**
+     * 修改分离培训模版
+     * 
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 结果
+     */
+    public int updateTTsFlplanTmpl(TTsFlplanTmpl tTsFlplanTmpl);
+
+    /**
+     * 批量删除分离培训模版
+     * 
+     * @param ids 需要删除的分离培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanTmplByIds(Long[] ids);
+
+    /**
+     * 删除分离培训模版信息
+     * 
+     * @param id 分离培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsFlplanTmplById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplan;
+
+/**
+ * 芳烃培训Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsFtplanService 
+{
+    /**
+     * 查询芳烃培训
+     * 
+     * @param id 芳烃培训ID
+     * @return 芳烃培训
+     */
+    public TTsFtplan selectTTsFtplanById(Long id);
+
+    /**
+     * 查询芳烃培训列表
+     * 
+     * @param tTsFtplan 芳烃培训
+     * @return 芳烃培训集合
+     */
+    public List<TTsFtplan> selectTTsFtplanList(TTsFtplan tTsFtplan);
+    public List<TTsFtplan> selectTTsFtplanListByNewId(TTsFtplan tTsFtplan);
+
+    /**
+     * 新增芳烃培训
+     * 
+     * @param tTsFtplan 芳烃培训
+     * @return 结果
+     */
+    public int insertTTsFtplan(TTsFtplan tTsFtplan);
+
+    /**
+     * 修改芳烃培训
+     * 
+     * @param tTsFtplan 芳烃培训
+     * @return 结果
+     */
+    public int updateTTsFtplan(TTsFtplan tTsFtplan);
+
+    /**
+     * 批量删除芳烃培训
+     * 
+     * @param ids 需要删除的芳烃培训ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanByIds(Long[] ids);
+
+    /**
+     * 删除芳烃培训信息
+     * 
+     * @param id 芳烃培训ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplanTmpl;
+
+/**
+ * 芳烃培训模版Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsFtplanTmplService 
+{
+    /**
+     * 查询芳烃培训模版
+     * 
+     * @param id 芳烃培训模版ID
+     * @return 芳烃培训模版
+     */
+    public TTsFtplanTmpl selectTTsFtplanTmplById(Long id);
+
+    /**
+     * 查询芳烃培训模版列表
+     * 
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 芳烃培训模版集合
+     */
+    public List<TTsFtplanTmpl> selectTTsFtplanTmplList(TTsFtplanTmpl tTsFtplanTmpl);
+
+    /**
+     * 新增芳烃培训模版
+     * 
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 结果
+     */
+    public int insertTTsFtplanTmpl(TTsFtplanTmpl tTsFtplanTmpl);
+
+    /**
+     * 修改芳烃培训模版
+     * 
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 结果
+     */
+    public int updateTTsFtplanTmpl(TTsFtplanTmpl tTsFtplanTmpl);
+
+    /**
+     * 批量删除芳烃培训模版
+     * 
+     * @param ids 需要删除的芳烃培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanTmplByIds(Long[] ids);
+
+    /**
+     * 删除芳烃培训模版信息
+     * 
+     * @param id 芳烃培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsFtplanTmplById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
+
+/**
+ * 裂解培训Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsLjplanService 
+{
+    /**
+     * 查询裂解培训
+     * 
+     * @param id 裂解培训ID
+     * @return 裂解培训
+     */
+    public TTsLjplan selectTTsLjplanById(Long id);
+
+    /**
+     * 查询裂解培训列表
+     * 
+     * @param tTsLjplan 裂解培训
+     * @return 裂解培训集合
+     */
+    public List<TTsLjplan> selectTTsLjplanList(TTsLjplan tTsLjplan);
+    public List<TTsLjplan> selectTTsLjplanListByNewId(TTsLjplan tTsLjplan);
+
+    /**
+     * 新增裂解培训
+     * 
+     * @param tTsLjplan 裂解培训
+     * @return 结果
+     */
+    public int insertTTsLjplan(TTsLjplan tTsLjplan);
+
+    /**
+     * 修改裂解培训
+     * 
+     * @param tTsLjplan 裂解培训
+     * @return 结果
+     */
+    public int updateTTsLjplan(TTsLjplan tTsLjplan);
+
+    /**
+     * 批量删除裂解培训
+     * 
+     * @param ids 需要删除的裂解培训ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanByIds(Long[] ids);
+
+    /**
+     * 删除裂解培训信息
+     * 
+     * @param id 裂解培训ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplanTmpl;
+
+/**
+ * 裂解培训模版Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsLjplanTmplService 
+{
+    /**
+     * 查询裂解培训模版
+     * 
+     * @param id 裂解培训模版ID
+     * @return 裂解培训模版
+     */
+    public TTsLjplanTmpl selectTTsLjplanTmplById(Long id);
+
+    /**
+     * 查询裂解培训模版列表
+     * 
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 裂解培训模版集合
+     */
+    public List<TTsLjplanTmpl> selectTTsLjplanTmplList(TTsLjplanTmpl tTsLjplanTmpl);
+
+    /**
+     * 新增裂解培训模版
+     * 
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 结果
+     */
+    public int insertTTsLjplanTmpl(TTsLjplanTmpl tTsLjplanTmpl);
+
+    /**
+     * 修改裂解培训模版
+     * 
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 结果
+     */
+    public int updateTTsLjplanTmpl(TTsLjplanTmpl tTsLjplanTmpl);
+
+    /**
+     * 批量删除裂解培训模版
+     * 
+     * @param ids 需要删除的裂解培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanTmplByIds(Long[] ids);
+
+    /**
+     * 删除裂解培训模版信息
+     * 
+     * @param id 裂解培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsLjplanTmplById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
+
+/**
+ * 转岗培训Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsYsplanService 
+{
+    /**
+     * 查询转岗培训
+     * 
+     * @param id 转岗培训ID
+     * @return 转岗培训
+     */
+    public TTsYsplan selectTTsYsplanById(Long id);
+
+    /**
+     * 查询转岗培训列表
+     * 
+     * @param tTsYsplan 转岗培训
+     * @return 转岗培训集合
+     */
+    public List<TTsYsplan> selectTTsYsplanList(TTsYsplan tTsYsplan);
+    public List<TTsYsplan> selectTTsYsplanListByNewId(TTsYsplan tTsYsplan);
+
+    /**
+     * 新增转岗培训
+     * 
+     * @param tTsYsplan 转岗培训
+     * @return 结果
+     */
+    public int insertTTsYsplan(TTsYsplan tTsYsplan);
+
+    /**
+     * 修改转岗培训
+     * 
+     * @param tTsYsplan 转岗培训
+     * @return 结果
+     */
+    public int updateTTsYsplan(TTsYsplan tTsYsplan);
+
+    /**
+     * 批量删除转岗培训
+     * 
+     * @param ids 需要删除的转岗培训ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanByIds(Long[] ids);
+
+    /**
+     * 删除转岗培训信息
+     * 
+     * @param id 转岗培训ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.training.bccnew.service;
+
+import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplanTmpl;
+
+/**
+ * 压缩培训模版Service接口
+ * 
+ * @author ssy
+ * @date 2024-06-13
+ */
+public interface ITTsYsplanTmplService 
+{
+    /**
+     * 查询压缩培训模版
+     * 
+     * @param id 压缩培训模版ID
+     * @return 压缩培训模版
+     */
+    public TTsYsplanTmpl selectTTsYsplanTmplById(Long id);
+
+    /**
+     * 查询压缩培训模版列表
+     * 
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 压缩培训模版集合
+     */
+    public List<TTsYsplanTmpl> selectTTsYsplanTmplList(TTsYsplanTmpl tTsYsplanTmpl);
+
+    /**
+     * 新增压缩培训模版
+     * 
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 结果
+     */
+    public int insertTTsYsplanTmpl(TTsYsplanTmpl tTsYsplanTmpl);
+
+    /**
+     * 修改压缩培训模版
+     * 
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 结果
+     */
+    public int updateTTsYsplanTmpl(TTsYsplanTmpl tTsYsplanTmpl);
+
+    /**
+     * 批量删除压缩培训模版
+     * 
+     * @param ids 需要删除的压缩培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanTmplByIds(Long[] ids);
+
+    /**
+     * 删除压缩培训模版信息
+     * 
+     * @param id 压缩培训模版ID
+     * @return 结果
+     */
+    public int deleteTTsYsplanTmplById(Long id);
+}

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

@@ -0,0 +1,92 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
+import com.ruoyi.project.training.bccnew.mapper.TTsFirstplanMapper;
+import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 进组培训Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-17
+ */
+@Service
+public class TTsFirstplanServiceImpl implements ITTsFirstplanService {
+    @Autowired
+    private TTsFirstplanMapper tTsFirstplanMapper;
+
+    /**
+     * 查询进组培训
+     *
+     * @param id 进组培训ID
+     * @return 进组培训
+     */
+    @Override
+    public TTsFirstplan selectTTsFirstplanById(Long id) {
+        return tTsFirstplanMapper.selectTTsFirstplanById(id);
+    }
+
+    @Override
+    public List<TTsFirstplan> selectTTsFirstplanListByNewId(TTsFirstplan tTsFirstplan) {
+        return tTsFirstplanMapper.selectTTsFirstplanListByNewId(tTsFirstplan);
+    }
+
+    /**
+     * 查询进组培训列表
+     *
+     * @param tTsFirstplan 进组培训
+     * @return 进组培训
+     */
+    @Override
+    public List<TTsFirstplan> selectTTsFirstplanList(TTsFirstplan tTsFirstplan) {
+        return tTsFirstplanMapper.selectTTsFirstplanList(tTsFirstplan);
+    }
+
+    /**
+     * 新增进组培训
+     *
+     * @param tTsFirstplan 进组培训
+     * @return 结果
+     */
+    @Override
+    public int insertTTsFirstplan(TTsFirstplan tTsFirstplan) {
+        return tTsFirstplanMapper.insertTTsFirstplan(tTsFirstplan);
+    }
+
+    /**
+     * 修改进组培训
+     *
+     * @param tTsFirstplan 进组培训
+     * @return 结果
+     */
+    @Override
+    public int updateTTsFirstplan(TTsFirstplan tTsFirstplan) {
+        return tTsFirstplanMapper.updateTTsFirstplan(tTsFirstplan);
+    }
+
+    /**
+     * 批量删除进组培训
+     *
+     * @param ids 需要删除的进组培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFirstplanByIds(Long[] ids) {
+        return tTsFirstplanMapper.deleteTTsFirstplanByIds(ids);
+    }
+
+    /**
+     * 删除进组培训信息
+     *
+     * @param id 进组培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFirstplanById(Long id) {
+        return tTsFirstplanMapper.deleteTTsFirstplanById(id);
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsFlplanMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
+import com.ruoyi.project.training.bccnew.service.ITTsFlplanService;
+
+/**
+ * 分离培训Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsFlplanServiceImpl implements ITTsFlplanService
+{
+    @Autowired
+    private TTsFlplanMapper tTsFlplanMapper;
+
+    /**
+     * 查询分离培训
+     *
+     * @param id 分离培训ID
+     * @return 分离培训
+     */
+    @Override
+    public TTsFlplan selectTTsFlplanById(Long id)
+    {
+        return tTsFlplanMapper.selectTTsFlplanById(id);
+    }
+
+    /**
+     * 查询分离培训列表
+     *
+     * @param tTsFlplan 分离培训
+     * @return 分离培训
+     */
+    @Override
+    public List<TTsFlplan> selectTTsFlplanList(TTsFlplan tTsFlplan)
+    {
+        return tTsFlplanMapper.selectTTsFlplanList(tTsFlplan);
+    }
+
+    @Override
+    public List<TTsFlplan> selectTTsFlplanListByNewId(TTsFlplan tTsFlplan) {
+        return tTsFlplanMapper.selectTTsFlplanListByNewId(tTsFlplan);
+    }
+
+    /**
+     * 新增分离培训
+     *
+     * @param tTsFlplan 分离培训
+     * @return 结果
+     */
+    @Override
+    public int insertTTsFlplan(TTsFlplan tTsFlplan)
+    {
+        return tTsFlplanMapper.insertTTsFlplan(tTsFlplan);
+    }
+
+    /**
+     * 修改分离培训
+     *
+     * @param tTsFlplan 分离培训
+     * @return 结果
+     */
+    @Override
+    public int updateTTsFlplan(TTsFlplan tTsFlplan)
+    {
+        return tTsFlplanMapper.updateTTsFlplan(tTsFlplan);
+    }
+
+    /**
+     * 批量删除分离培训
+     *
+     * @param ids 需要删除的分离培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFlplanByIds(Long[] ids)
+    {
+        return tTsFlplanMapper.deleteTTsFlplanByIds(ids);
+    }
+
+    /**
+     * 删除分离培训信息
+     *
+     * @param id 分离培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFlplanById(Long id)
+    {
+        return tTsFlplanMapper.deleteTTsFlplanById(id);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsFlplanTmplMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsFlplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsFlplanTmplService;
+
+/**
+ * 分离培训模版Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsFlplanTmplServiceImpl implements ITTsFlplanTmplService
+{
+    @Autowired
+    private TTsFlplanTmplMapper tTsFlplanTmplMapper;
+
+    /**
+     * 查询分离培训模版
+     *
+     * @param id 分离培训模版ID
+     * @return 分离培训模版
+     */
+    @Override
+    public TTsFlplanTmpl selectTTsFlplanTmplById(Long id)
+    {
+        return tTsFlplanTmplMapper.selectTTsFlplanTmplById(id);
+    }
+
+    /**
+     * 查询分离培训模版列表
+     *
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 分离培训模版
+     */
+    @Override
+    public List<TTsFlplanTmpl> selectTTsFlplanTmplList(TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        return tTsFlplanTmplMapper.selectTTsFlplanTmplList(tTsFlplanTmpl);
+    }
+
+    /**
+     * 新增分离培训模版
+     *
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 结果
+     */
+    @Override
+    public int insertTTsFlplanTmpl(TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        return tTsFlplanTmplMapper.insertTTsFlplanTmpl(tTsFlplanTmpl);
+    }
+
+    /**
+     * 修改分离培训模版
+     *
+     * @param tTsFlplanTmpl 分离培训模版
+     * @return 结果
+     */
+    @Override
+    public int updateTTsFlplanTmpl(TTsFlplanTmpl tTsFlplanTmpl)
+    {
+        return tTsFlplanTmplMapper.updateTTsFlplanTmpl(tTsFlplanTmpl);
+    }
+
+    /**
+     * 批量删除分离培训模版
+     *
+     * @param ids 需要删除的分离培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFlplanTmplByIds(Long[] ids)
+    {
+        return tTsFlplanTmplMapper.deleteTTsFlplanTmplByIds(ids);
+    }
+
+    /**
+     * 删除分离培训模版信息
+     *
+     * @param id 分离培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFlplanTmplById(Long id)
+    {
+        return tTsFlplanTmplMapper.deleteTTsFlplanTmplById(id);
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsFtplanMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplan;
+import com.ruoyi.project.training.bccnew.service.ITTsFtplanService;
+
+/**
+ * 芳烃培训Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsFtplanServiceImpl implements ITTsFtplanService
+{
+    @Autowired
+    private TTsFtplanMapper tTsFtplanMapper;
+
+    /**
+     * 查询芳烃培训
+     *
+     * @param id 芳烃培训ID
+     * @return 芳烃培训
+     */
+    @Override
+    public TTsFtplan selectTTsFtplanById(Long id)
+    {
+        return tTsFtplanMapper.selectTTsFtplanById(id);
+    }
+
+    /**
+     * 查询芳烃培训列表
+     *
+     * @param tTsFtplan 芳烃培训
+     * @return 芳烃培训
+     */
+    @Override
+    public List<TTsFtplan> selectTTsFtplanList(TTsFtplan tTsFtplan)
+    {
+        return tTsFtplanMapper.selectTTsFtplanList(tTsFtplan);
+    }
+    @Override
+    public List<TTsFtplan> selectTTsFtplanListByNewId(TTsFtplan tTsFtplan)
+    {
+        return tTsFtplanMapper.selectTTsFtplanListByNewId(tTsFtplan);
+    }
+
+    /**
+     * 新增芳烃培训
+     *
+     * @param tTsFtplan 芳烃培训
+     * @return 结果
+     */
+    @Override
+    public int insertTTsFtplan(TTsFtplan tTsFtplan)
+    {
+        return tTsFtplanMapper.insertTTsFtplan(tTsFtplan);
+    }
+
+    /**
+     * 修改芳烃培训
+     *
+     * @param tTsFtplan 芳烃培训
+     * @return 结果
+     */
+    @Override
+    public int updateTTsFtplan(TTsFtplan tTsFtplan)
+    {
+        return tTsFtplanMapper.updateTTsFtplan(tTsFtplan);
+    }
+
+    /**
+     * 批量删除芳烃培训
+     *
+     * @param ids 需要删除的芳烃培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFtplanByIds(Long[] ids)
+    {
+        return tTsFtplanMapper.deleteTTsFtplanByIds(ids);
+    }
+
+    /**
+     * 删除芳烃培训信息
+     *
+     * @param id 芳烃培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFtplanById(Long id)
+    {
+        return tTsFtplanMapper.deleteTTsFtplanById(id);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsFtplanTmplMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsFtplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsFtplanTmplService;
+
+/**
+ * 芳烃培训模版Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsFtplanTmplServiceImpl implements ITTsFtplanTmplService
+{
+    @Autowired
+    private TTsFtplanTmplMapper tTsFtplanTmplMapper;
+
+    /**
+     * 查询芳烃培训模版
+     *
+     * @param id 芳烃培训模版ID
+     * @return 芳烃培训模版
+     */
+    @Override
+    public TTsFtplanTmpl selectTTsFtplanTmplById(Long id)
+    {
+        return tTsFtplanTmplMapper.selectTTsFtplanTmplById(id);
+    }
+
+    /**
+     * 查询芳烃培训模版列表
+     *
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 芳烃培训模版
+     */
+    @Override
+    public List<TTsFtplanTmpl> selectTTsFtplanTmplList(TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        return tTsFtplanTmplMapper.selectTTsFtplanTmplList(tTsFtplanTmpl);
+    }
+
+    /**
+     * 新增芳烃培训模版
+     *
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 结果
+     */
+    @Override
+    public int insertTTsFtplanTmpl(TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        return tTsFtplanTmplMapper.insertTTsFtplanTmpl(tTsFtplanTmpl);
+    }
+
+    /**
+     * 修改芳烃培训模版
+     *
+     * @param tTsFtplanTmpl 芳烃培训模版
+     * @return 结果
+     */
+    @Override
+    public int updateTTsFtplanTmpl(TTsFtplanTmpl tTsFtplanTmpl)
+    {
+        return tTsFtplanTmplMapper.updateTTsFtplanTmpl(tTsFtplanTmpl);
+    }
+
+    /**
+     * 批量删除芳烃培训模版
+     *
+     * @param ids 需要删除的芳烃培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFtplanTmplByIds(Long[] ids)
+    {
+        return tTsFtplanTmplMapper.deleteTTsFtplanTmplByIds(ids);
+    }
+
+    /**
+     * 删除芳烃培训模版信息
+     *
+     * @param id 芳烃培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsFtplanTmplById(Long id)
+    {
+        return tTsFtplanTmplMapper.deleteTTsFtplanTmplById(id);
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsLjplanMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
+import com.ruoyi.project.training.bccnew.service.ITTsLjplanService;
+
+/**
+ * 裂解培训Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsLjplanServiceImpl implements ITTsLjplanService
+{
+    @Autowired
+    private TTsLjplanMapper tTsLjplanMapper;
+
+    /**
+     * 查询裂解培训
+     *
+     * @param id 裂解培训ID
+     * @return 裂解培训
+     */
+    @Override
+    public TTsLjplan selectTTsLjplanById(Long id)
+    {
+        return tTsLjplanMapper.selectTTsLjplanById(id);
+    }
+
+    /**
+     * 查询裂解培训列表
+     *
+     * @param tTsLjplan 裂解培训
+     * @return 裂解培训
+     */
+    @Override
+    public List<TTsLjplan> selectTTsLjplanList(TTsLjplan tTsLjplan)
+    {
+        return tTsLjplanMapper.selectTTsLjplanList(tTsLjplan);
+    }
+    @Override
+    public List<TTsLjplan> selectTTsLjplanListByNewId(TTsLjplan tTsLjplan)
+    {
+        return tTsLjplanMapper.selectTTsLjplanListByNewId(tTsLjplan);
+    }
+
+    /**
+     * 新增裂解培训
+     *
+     * @param tTsLjplan 裂解培训
+     * @return 结果
+     */
+    @Override
+    public int insertTTsLjplan(TTsLjplan tTsLjplan)
+    {
+        return tTsLjplanMapper.insertTTsLjplan(tTsLjplan);
+    }
+
+    /**
+     * 修改裂解培训
+     *
+     * @param tTsLjplan 裂解培训
+     * @return 结果
+     */
+    @Override
+    public int updateTTsLjplan(TTsLjplan tTsLjplan)
+    {
+        return tTsLjplanMapper.updateTTsLjplan(tTsLjplan);
+    }
+
+    /**
+     * 批量删除裂解培训
+     *
+     * @param ids 需要删除的裂解培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsLjplanByIds(Long[] ids)
+    {
+        return tTsLjplanMapper.deleteTTsLjplanByIds(ids);
+    }
+
+    /**
+     * 删除裂解培训信息
+     *
+     * @param id 裂解培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsLjplanById(Long id)
+    {
+        return tTsLjplanMapper.deleteTTsLjplanById(id);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsLjplanTmplMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsLjplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsLjplanTmplService;
+
+/**
+ * 裂解培训模版Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsLjplanTmplServiceImpl implements ITTsLjplanTmplService
+{
+    @Autowired
+    private TTsLjplanTmplMapper tTsLjplanTmplMapper;
+
+    /**
+     * 查询裂解培训模版
+     *
+     * @param id 裂解培训模版ID
+     * @return 裂解培训模版
+     */
+    @Override
+    public TTsLjplanTmpl selectTTsLjplanTmplById(Long id)
+    {
+        return tTsLjplanTmplMapper.selectTTsLjplanTmplById(id);
+    }
+
+    /**
+     * 查询裂解培训模版列表
+     *
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 裂解培训模版
+     */
+    @Override
+    public List<TTsLjplanTmpl> selectTTsLjplanTmplList(TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        return tTsLjplanTmplMapper.selectTTsLjplanTmplList(tTsLjplanTmpl);
+    }
+
+    /**
+     * 新增裂解培训模版
+     *
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 结果
+     */
+    @Override
+    public int insertTTsLjplanTmpl(TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        return tTsLjplanTmplMapper.insertTTsLjplanTmpl(tTsLjplanTmpl);
+    }
+
+    /**
+     * 修改裂解培训模版
+     *
+     * @param tTsLjplanTmpl 裂解培训模版
+     * @return 结果
+     */
+    @Override
+    public int updateTTsLjplanTmpl(TTsLjplanTmpl tTsLjplanTmpl)
+    {
+        return tTsLjplanTmplMapper.updateTTsLjplanTmpl(tTsLjplanTmpl);
+    }
+
+    /**
+     * 批量删除裂解培训模版
+     *
+     * @param ids 需要删除的裂解培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsLjplanTmplByIds(Long[] ids)
+    {
+        return tTsLjplanTmplMapper.deleteTTsLjplanTmplByIds(ids);
+    }
+
+    /**
+     * 删除裂解培训模版信息
+     *
+     * @param id 裂解培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsLjplanTmplById(Long id)
+    {
+        return tTsLjplanTmplMapper.deleteTTsLjplanTmplById(id);
+    }
+}

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

@@ -1,11 +1,12 @@
 package com.ruoyi.project.training.bccnew.service.impl;
 
-import java.util.List;
+import com.ruoyi.project.training.bccnew.domain.*;
+import com.ruoyi.project.training.bccnew.mapper.*;
+import com.ruoyi.project.training.bccnew.service.ITTsNewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.training.bccnew.mapper.TTsNewMapper;
-import com.ruoyi.project.training.bccnew.domain.TTsNew;
-import com.ruoyi.project.training.bccnew.service.ITTsNewService;
+
+import java.util.List;
 
 /**
  * 导师带徒Service业务层处理
@@ -14,11 +15,37 @@ import com.ruoyi.project.training.bccnew.service.ITTsNewService;
  * @date 2024-05-20
  */
 @Service
-public class TTsNewServiceImpl implements ITTsNewService
-{
+public class TTsNewServiceImpl implements ITTsNewService {
     @Autowired
     private TTsNewMapper tTsNewMapper;
 
+    @Autowired
+    private TTsLjplanTmplMapper tTsLjplanTmplMapper;
+
+    @Autowired
+    private TTsLjplanMapper tTsLjplanMapper;
+
+
+    @Autowired
+    private TTsYsplanTmplMapper tTsYsplanTmplMapper;
+
+    @Autowired
+    private TTsYsplanMapper tTsYsplanMapper;
+
+
+    @Autowired
+    private TTsFlplanTmplMapper tTsFlplanTmplMapper;
+
+    @Autowired
+    private TTsFlplanMapper tTsFlplanMapper;
+
+
+    @Autowired
+    private TTsFtplanTmplMapper tTsFtplanTmplMapper;
+
+    @Autowired
+    private TTsFtplanMapper tTsFtplanMapper;
+
     /**
      * 查询导师带徒
      *
@@ -26,8 +53,7 @@ public class TTsNewServiceImpl implements ITTsNewService
      * @return 导师带徒
      */
     @Override
-    public TTsNew selectTTsNewById(Long newId)
-    {
+    public TTsNew selectTTsNewById(Long newId) {
         return tTsNewMapper.selectTTsNewById(newId);
     }
 
@@ -38,8 +64,7 @@ public class TTsNewServiceImpl implements ITTsNewService
      * @return 导师带徒
      */
     @Override
-    public List<TTsNew> selectTTsNewList(TTsNew tTsNew)
-    {
+    public List<TTsNew> selectTTsNewList(TTsNew tTsNew) {
         return tTsNewMapper.selectTTsNewList(tTsNew);
     }
 
@@ -50,9 +75,70 @@ public class TTsNewServiceImpl implements ITTsNewService
      * @return 结果
      */
     @Override
-    public int insertTTsNew(TTsNew tTsNew)
-    {
-        return tTsNewMapper.insertTTsNew(tTsNew);
+    public int insertTTsNew(TTsNew tTsNew) {
+        tTsNewMapper.insertTTsNew(tTsNew);
+        if (tTsNew.getPlanType() == 1) {
+            for (TTsLjplanTmpl item : tTsLjplanTmplMapper.selectTTsLjplanTmplList(new TTsLjplanTmpl())) {
+                TTsLjplan entity = new TTsLjplan();
+                entity.setCourseCode(item.getCourseCode());
+                entity.setTopic(item.getTopic());
+                entity.setContent(item.getContent());
+                entity.setCourseDay(item.getCourseDay());
+                entity.setCourseHour(item.getCourseHour());
+                entity.setDetailPlan(item.getDetailPlan());
+                entity.setTrainer(item.getTrainer());
+                entity.setCourseDate(item.getCourseDate());
+                entity.setAssess(item.getAssess());
+                entity.setNewId(tTsNew.getNewId());
+                tTsLjplanMapper.insertTTsLjplan(entity);
+            }
+        } else if (tTsNew.getPlanType() == 2) {
+            for (TTsYsplanTmpl item : tTsYsplanTmplMapper.selectTTsYsplanTmplList(new TTsYsplanTmpl())) {
+                TTsYsplan entity = new TTsYsplan();
+                entity.setCourseCode(item.getCourseCode());
+                entity.setTopic(item.getTopic());
+                entity.setContent(item.getContent());
+                entity.setCourseDay(item.getCourseDay());
+                entity.setCourseHour(item.getCourseHour());
+                entity.setDetailPlan(item.getDetailPlan());
+                entity.setTrainer(item.getTrainer());
+                entity.setCourseDate(item.getCourseDate());
+                entity.setAssess(item.getAssess());
+                entity.setNewId(tTsNew.getNewId());
+                tTsYsplanMapper.insertTTsYsplan(entity);
+            }
+        } else if (tTsNew.getPlanType() == 3) {
+            for (TTsFlplanTmpl item : tTsFlplanTmplMapper.selectTTsFlplanTmplList(new TTsFlplanTmpl())) {
+                TTsFlplan entity = new TTsFlplan();
+                entity.setCourseCode(item.getCourseCode());
+                entity.setTopic(item.getTopic());
+                entity.setContent(item.getContent());
+                entity.setCourseDay(item.getCourseDay());
+                entity.setCourseHour(item.getCourseHour());
+                entity.setDetailPlan(item.getDetailPlan());
+                entity.setTrainer(item.getTrainer());
+                entity.setCourseDate(item.getCourseDate());
+                entity.setAssess(item.getAssess());
+                entity.setNewId(tTsNew.getNewId());
+                tTsFlplanMapper.insertTTsFlplan(entity);
+            }
+        } else if (tTsNew.getPlanType() == 4) {
+            for (TTsFtplanTmpl item : tTsFtplanTmplMapper.selectTTsFtplanTmplList(new TTsFtplanTmpl())) {
+                TTsFtplan entity = new TTsFtplan();
+                entity.setCourseCode(item.getCourseCode());
+                entity.setTopic(item.getTopic());
+                entity.setContent(item.getContent());
+                entity.setCourseDay(item.getCourseDay());
+                entity.setCourseHour(item.getCourseHour());
+                entity.setDetailPlan(item.getDetailPlan());
+                entity.setTrainer(item.getTrainer());
+                entity.setCourseDate(item.getCourseDate());
+                entity.setAssess(item.getAssess());
+                entity.setNewId(tTsNew.getNewId());
+                tTsFtplanMapper.insertTTsFtplan(entity);
+            }
+        }
+        return 1;
     }
 
     /**
@@ -62,8 +148,7 @@ public class TTsNewServiceImpl implements ITTsNewService
      * @return 结果
      */
     @Override
-    public int updateTTsNew(TTsNew tTsNew)
-    {
+    public int updateTTsNew(TTsNew tTsNew) {
         return tTsNewMapper.updateTTsNew(tTsNew);
     }
 
@@ -74,8 +159,7 @@ public class TTsNewServiceImpl implements ITTsNewService
      * @return 结果
      */
     @Override
-    public int deleteTTsNewByIds(Long[] newIds)
-    {
+    public int deleteTTsNewByIds(Long[] newIds) {
         return tTsNewMapper.deleteTTsNewByIds(newIds);
     }
 
@@ -86,8 +170,7 @@ public class TTsNewServiceImpl implements ITTsNewService
      * @return 结果
      */
     @Override
-    public int deleteTTsNewById(Long newId)
-    {
+    public int deleteTTsNewById(Long newId) {
         return tTsNewMapper.deleteTTsNewById(newId);
     }
 }

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

@@ -0,0 +1,99 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsYsplanMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
+import com.ruoyi.project.training.bccnew.service.ITTsYsplanService;
+
+/**
+ * 转岗培训Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsYsplanServiceImpl implements ITTsYsplanService
+{
+    @Autowired
+    private TTsYsplanMapper tTsYsplanMapper;
+
+    /**
+     * 查询转岗培训
+     *
+     * @param id 转岗培训ID
+     * @return 转岗培训
+     */
+    @Override
+    public TTsYsplan selectTTsYsplanById(Long id)
+    {
+        return tTsYsplanMapper.selectTTsYsplanById(id);
+    }
+
+    /**
+     * 查询转岗培训列表
+     *
+     * @param tTsYsplan 转岗培训
+     * @return 转岗培训
+     */
+    @Override
+    public List<TTsYsplan> selectTTsYsplanList(TTsYsplan tTsYsplan)
+    {
+        return tTsYsplanMapper.selectTTsYsplanList(tTsYsplan);
+    }
+
+    @Override
+    public List<TTsYsplan> selectTTsYsplanListByNewId(TTsYsplan tTsYsplan)
+    {
+        return tTsYsplanMapper.selectTTsYsplanListByNewId(tTsYsplan);
+    }
+
+    /**
+     * 新增转岗培训
+     *
+     * @param tTsYsplan 转岗培训
+     * @return 结果
+     */
+    @Override
+    public int insertTTsYsplan(TTsYsplan tTsYsplan)
+    {
+        return tTsYsplanMapper.insertTTsYsplan(tTsYsplan);
+    }
+
+    /**
+     * 修改转岗培训
+     *
+     * @param tTsYsplan 转岗培训
+     * @return 结果
+     */
+    @Override
+    public int updateTTsYsplan(TTsYsplan tTsYsplan)
+    {
+        return tTsYsplanMapper.updateTTsYsplan(tTsYsplan);
+    }
+
+    /**
+     * 批量删除转岗培训
+     *
+     * @param ids 需要删除的转岗培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsYsplanByIds(Long[] ids)
+    {
+        return tTsYsplanMapper.deleteTTsYsplanByIds(ids);
+    }
+
+    /**
+     * 删除转岗培训信息
+     *
+     * @param id 转岗培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsYsplanById(Long id)
+    {
+        return tTsYsplanMapper.deleteTTsYsplanById(id);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.project.training.bccnew.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.bccnew.mapper.TTsYsplanTmplMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsYsplanTmpl;
+import com.ruoyi.project.training.bccnew.service.ITTsYsplanTmplService;
+
+/**
+ * 压缩培训模版Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-06-13
+ */
+@Service
+public class TTsYsplanTmplServiceImpl implements ITTsYsplanTmplService
+{
+    @Autowired
+    private TTsYsplanTmplMapper tTsYsplanTmplMapper;
+
+    /**
+     * 查询压缩培训模版
+     *
+     * @param id 压缩培训模版ID
+     * @return 压缩培训模版
+     */
+    @Override
+    public TTsYsplanTmpl selectTTsYsplanTmplById(Long id)
+    {
+        return tTsYsplanTmplMapper.selectTTsYsplanTmplById(id);
+    }
+
+    /**
+     * 查询压缩培训模版列表
+     *
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 压缩培训模版
+     */
+    @Override
+    public List<TTsYsplanTmpl> selectTTsYsplanTmplList(TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        return tTsYsplanTmplMapper.selectTTsYsplanTmplList(tTsYsplanTmpl);
+    }
+
+    /**
+     * 新增压缩培训模版
+     *
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 结果
+     */
+    @Override
+    public int insertTTsYsplanTmpl(TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        return tTsYsplanTmplMapper.insertTTsYsplanTmpl(tTsYsplanTmpl);
+    }
+
+    /**
+     * 修改压缩培训模版
+     *
+     * @param tTsYsplanTmpl 压缩培训模版
+     * @return 结果
+     */
+    @Override
+    public int updateTTsYsplanTmpl(TTsYsplanTmpl tTsYsplanTmpl)
+    {
+        return tTsYsplanTmplMapper.updateTTsYsplanTmpl(tTsYsplanTmpl);
+    }
+
+    /**
+     * 批量删除压缩培训模版
+     *
+     * @param ids 需要删除的压缩培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsYsplanTmplByIds(Long[] ids)
+    {
+        return tTsYsplanTmplMapper.deleteTTsYsplanTmplByIds(ids);
+    }
+
+    /**
+     * 删除压缩培训模版信息
+     *
+     * @param id 压缩培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTsYsplanTmplById(Long id)
+    {
+        return tTsYsplanTmplMapper.deleteTTsYsplanTmplById(id);
+    }
+}

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

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsFirstplanMapper">
+    
+    <resultMap type="TTsFirstplan" id="TTsFirstplanResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="courseType"    column="course_type"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="planStatus"    column="plan_status"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsFirstplanVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.course_day, d.course_hour, d.course_type, 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 ,s.dept_name from t_ts_firstplan d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTsFirstplanList" parameterType="TTsFirstplan" resultMap="TTsFirstplanResult">
+        <include refid="selectTTsFirstplanVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="courseType != null  and courseType != ''"> and course_type = #{courseType}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsFirstplanById" parameterType="Long" resultMap="TTsFirstplanResult">
+        <include refid="selectTTsFirstplanVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTTsFirstplanListByNewId" parameterType="TTsFirstplan" resultMap="TTsFirstplanResult">
+        <include refid="selectTTsFirstplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="courseType != null  and courseType != ''"> and course_type = #{courseType}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+        
+    <insert id="insertTTsFirstplan" parameterType="TTsFirstplan">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_firstplan.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_firstplan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="courseType != null">course_type,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="planStatus != null">plan_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="courseType != null">#{courseType},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="planStatus != null">#{planStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsFirstplan" parameterType="TTsFirstplan">
+        update t_ts_firstplan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="courseType != null">course_type = #{courseType},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="planStatus != null">plan_status = #{planStatus},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsFirstplanById" parameterType="Long">
+        update t_ts_firstplan set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsFirstplanByIds" parameterType="String">
+        update t_ts_firstplan set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsFlplanMapper">
+    
+    <resultMap type="TTsFlplan" id="TTsFlplanResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="planStatus"    column="plan_status"    />
+        <result property="score1"    column="score_1"    />
+        <result property="score2"    column="score_2"    />
+        <result property="score3"    column="score_3"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsFlplanVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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_flplan d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTsFlplanList" parameterType="TTsFlplan" resultMap="TTsFlplanResult">
+        <include refid="selectTTsFlplanVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            <if test="score1 != null  and score1 != ''"> and score_1 = #{score1}</if>
+            <if test="score2 != null  and score2 != ''"> and score_2 = #{score2}</if>
+            <if test="score3 != null  and score3 != ''"> and score_3 = #{score3}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsFlplanById" parameterType="Long" resultMap="TTsFlplanResult">
+        <include refid="selectTTsFlplanVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTTsFlplanListByNewId" parameterType="TTsFlplan" resultMap="TTsFlplanResult">
+        <include refid="selectTTsFlplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+
+        
+    <insert id="insertTTsFlplan" parameterType="TTsFlplan">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_flplan.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_flplan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="planStatus != null">plan_status,</if>
+            <if test="score1 != null">score_1,</if>
+            <if test="score2 != null">score_2,</if>
+            <if test="score3 != null">score_3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="planStatus != null">#{planStatus},</if>
+            <if test="score1 != null">#{score1},</if>
+            <if test="score2 != null">#{score2},</if>
+            <if test="score3 != null">#{score3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsFlplan" parameterType="TTsFlplan">
+        update t_ts_flplan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="planStatus != null">plan_status = #{planStatus},</if>
+            <if test="score1 != null">score_1 = #{score1},</if>
+            <if test="score2 != null">score_2 = #{score2},</if>
+            <if test="score3 != null">score_3 = #{score3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsFlplanById" parameterType="Long">
+        update t_ts_flplan set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsFlplanByIds" parameterType="String">
+        update t_ts_flplan set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsFlplanTmplMapper">
+    
+    <resultMap type="TTsFlplanTmpl" id="TTsFlplanTmplResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsFlplanTmplVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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 ,s.dept_name from t_ts_flplan_tmpl d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTsFlplanTmplList" parameterType="TTsFlplanTmpl" resultMap="TTsFlplanTmplResult">
+        <include refid="selectTTsFlplanTmplVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsFlplanTmplById" parameterType="Long" resultMap="TTsFlplanTmplResult">
+        <include refid="selectTTsFlplanTmplVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTTsFlplanTmpl" parameterType="TTsFlplanTmpl">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_flplan_tmpl.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_flplan_tmpl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsFlplanTmpl" parameterType="TTsFlplanTmpl">
+        update t_ts_flplan_tmpl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsFlplanTmplById" parameterType="Long">
+        update t_ts_flplan_tmpl set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsFlplanTmplByIds" parameterType="String">
+        update t_ts_flplan_tmpl set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsFtplanMapper">
+    
+    <resultMap type="TTsFtplan" id="TTsFtplanResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="planStatus"    column="plan_status"    />
+        <result property="score1"    column="score_1"    />
+        <result property="score2"    column="score_2"    />
+        <result property="score3"    column="score_3"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsFtplanVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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
+    </sql>
+
+    <select id="selectTTsFtplanList" parameterType="TTsFtplan" resultMap="TTsFtplanResult">
+        <include refid="selectTTsFtplanVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            <if test="score1 != null  and score1 != ''"> and score_1 = #{score1}</if>
+            <if test="score2 != null  and score2 != ''"> and score_2 = #{score2}</if>
+            <if test="score3 != null  and score3 != ''"> and score_3 = #{score3}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsFtplanById" parameterType="Long" resultMap="TTsFtplanResult">
+        <include refid="selectTTsFtplanVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTTsFtplanListByNewId" parameterType="TTsFtplan" resultMap="TTsFtplanResult">
+        <include refid="selectTTsFtplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+        
+    <insert id="insertTTsFtplan" parameterType="TTsFtplan">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_ftplan.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_ftplan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="planStatus != null">plan_status,</if>
+            <if test="score1 != null">score_1,</if>
+            <if test="score2 != null">score_2,</if>
+            <if test="score3 != null">score_3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="planStatus != null">#{planStatus},</if>
+            <if test="score1 != null">#{score1},</if>
+            <if test="score2 != null">#{score2},</if>
+            <if test="score3 != null">#{score3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsFtplan" parameterType="TTsFtplan">
+        update t_ts_ftplan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="planStatus != null">plan_status = #{planStatus},</if>
+            <if test="score1 != null">score_1 = #{score1},</if>
+            <if test="score2 != null">score_2 = #{score2},</if>
+            <if test="score3 != null">score_3 = #{score3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsFtplanById" parameterType="Long">
+        update t_ts_ftplan set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsFtplanByIds" parameterType="String">
+        update t_ts_ftplan set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsFtplanTmplMapper">
+    
+    <resultMap type="TTsFtplanTmpl" id="TTsFtplanTmplResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsFtplanTmplVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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 ,s.dept_name from t_ts_ftplan_tmpl d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTsFtplanTmplList" parameterType="TTsFtplanTmpl" resultMap="TTsFtplanTmplResult">
+        <include refid="selectTTsFtplanTmplVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsFtplanTmplById" parameterType="Long" resultMap="TTsFtplanTmplResult">
+        <include refid="selectTTsFtplanTmplVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTTsFtplanTmpl" parameterType="TTsFtplanTmpl">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_ftplan_tmpl.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_ftplan_tmpl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsFtplanTmpl" parameterType="TTsFtplanTmpl">
+        update t_ts_ftplan_tmpl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsFtplanTmplById" parameterType="Long">
+        update t_ts_ftplan_tmpl set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsFtplanTmplByIds" parameterType="String">
+        update t_ts_ftplan_tmpl set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsLjplanMapper">
+    
+    <resultMap type="TTsLjplan" id="TTsLjplanResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="planStatus"    column="plan_status"    />
+        <result property="score1"    column="score_1"    />
+        <result property="score2"    column="score_2"    />
+        <result property="score3"    column="score_3"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsLjplanVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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
+    </sql>
+
+    <select id="selectTTsLjplanList" parameterType="TTsLjplan" resultMap="TTsLjplanResult">
+        <include refid="selectTTsLjplanVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            <if test="score1 != null  and score1 != ''"> and score_1 = #{score1}</if>
+            <if test="score2 != null  and score2 != ''"> and score_2 = #{score2}</if>
+            <if test="score3 != null  and score3 != ''"> and score_3 = #{score3}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsLjplanById" parameterType="Long" resultMap="TTsLjplanResult">
+        <include refid="selectTTsLjplanVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTTsLjplanListByNewId" parameterType="TTsLjplan" resultMap="TTsLjplanResult">
+        <include refid="selectTTsLjplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+        
+    <insert id="insertTTsLjplan" parameterType="TTsLjplan">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_ljplan.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_ljplan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="planStatus != null">plan_status,</if>
+            <if test="score1 != null">score_1,</if>
+            <if test="score2 != null">score_2,</if>
+            <if test="score3 != null">score_3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="planStatus != null">#{planStatus},</if>
+            <if test="score1 != null">#{score1},</if>
+            <if test="score2 != null">#{score2},</if>
+            <if test="score3 != null">#{score3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsLjplan" parameterType="TTsLjplan">
+        update t_ts_ljplan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="planStatus != null">plan_status = #{planStatus},</if>
+            <if test="score1 != null">score_1 = #{score1},</if>
+            <if test="score2 != null">score_2 = #{score2},</if>
+            <if test="score3 != null">score_3 = #{score3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsLjplanById" parameterType="Long">
+        update t_ts_ljplan set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsLjplanByIds" parameterType="String">
+        update t_ts_ljplan set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsLjplanTmplMapper">
+    
+    <resultMap type="TTsLjplanTmpl" id="TTsLjplanTmplResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsLjplanTmplVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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 ,s.dept_name from t_ts_ljplan_tmpl d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTsLjplanTmplList" parameterType="TTsLjplanTmpl" resultMap="TTsLjplanTmplResult">
+        <include refid="selectTTsLjplanTmplVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsLjplanTmplById" parameterType="Long" resultMap="TTsLjplanTmplResult">
+        <include refid="selectTTsLjplanTmplVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTTsLjplanTmpl" parameterType="TTsLjplanTmpl">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_ljplan_tmpl.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_ljplan_tmpl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsLjplanTmpl" parameterType="TTsLjplanTmpl">
+        update t_ts_ljplan_tmpl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsLjplanTmplById" parameterType="Long">
+        update t_ts_ljplan_tmpl set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsLjplanTmplByIds" parameterType="String">
+        update t_ts_ljplan_tmpl set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsYsplanMapper">
+    
+    <resultMap type="TTsYsplan" id="TTsYsplanResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="planStatus"    column="plan_status"    />
+        <result property="score1"    column="score_1"    />
+        <result property="score2"    column="score_2"    />
+        <result property="score3"    column="score_3"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsYsplanVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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
+    </sql>
+
+    <select id="selectTTsYsplanList" parameterType="TTsYsplan" resultMap="TTsYsplanResult">
+        <include refid="selectTTsYsplanVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            <if test="score1 != null  and score1 != ''"> and score_1 = #{score1}</if>
+            <if test="score2 != null  and score2 != ''"> and score_2 = #{score2}</if>
+            <if test="score3 != null  and score3 != ''"> and score_3 = #{score3}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsYsplanById" parameterType="Long" resultMap="TTsYsplanResult">
+        <include refid="selectTTsYsplanVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTTsYsplanListByNewId" parameterType="TTsYsplan" resultMap="TTsYsplanResult">
+        <include refid="selectTTsYsplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+        
+    <insert id="insertTTsYsplan" parameterType="TTsYsplan">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_ysplan.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_ysplan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="planStatus != null">plan_status,</if>
+            <if test="score1 != null">score_1,</if>
+            <if test="score2 != null">score_2,</if>
+            <if test="score3 != null">score_3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="planStatus != null">#{planStatus},</if>
+            <if test="score1 != null">#{score1},</if>
+            <if test="score2 != null">#{score2},</if>
+            <if test="score3 != null">#{score3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsYsplan" parameterType="TTsYsplan">
+        update t_ts_ysplan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="planStatus != null">plan_status = #{planStatus},</if>
+            <if test="score1 != null">score_1 = #{score1},</if>
+            <if test="score2 != null">score_2 = #{score2},</if>
+            <if test="score3 != null">score_3 = #{score3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsYsplanById" parameterType="Long">
+        update t_ts_ysplan set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsYsplanByIds" parameterType="String">
+        update t_ts_ysplan set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.training.bccnew.mapper.TTsYsplanTmplMapper">
+    
+    <resultMap type="TTsYsplanTmpl" id="TTsYsplanTmplResult">
+        <result property="id"    column="id"    />
+        <result property="newId"    column="new_id"    />
+        <result property="courseCode"    column="course_code"    />
+        <result property="topic"    column="topic"    />
+        <result property="content"    column="content"    />
+        <result property="courseDay"    column="course_day"    />
+        <result property="courseHour"    column="course_hour"    />
+        <result property="detailPlan"    column="detail_plan"    />
+        <result property="trainer"    column="trainer"    />
+        <result property="courseDate"    column="course_date"    />
+        <result property="assess"    column="assess"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTsYsplanTmplVo">
+        select d.id, d.new_id, d.course_code, d.topic, d.content, d.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 ,s.dept_name from t_ts_ysplan_tmpl d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTsYsplanTmplList" parameterType="TTsYsplanTmpl" resultMap="TTsYsplanTmplResult">
+        <include refid="selectTTsYsplanTmplVo"/>
+        <where>  
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTTsYsplanTmplById" parameterType="Long" resultMap="TTsYsplanTmplResult">
+        <include refid="selectTTsYsplanTmplVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTTsYsplanTmpl" parameterType="TTsYsplanTmpl">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_ts_ysplan_tmpl.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_ts_ysplan_tmpl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="newId != null">new_id,</if>
+            <if test="courseCode != null">course_code,</if>
+            <if test="topic != null">topic,</if>
+            <if test="content != null">content,</if>
+            <if test="courseDay != null">course_day,</if>
+            <if test="courseHour != null">course_hour,</if>
+            <if test="detailPlan != null">detail_plan,</if>
+            <if test="trainer != null">trainer,</if>
+            <if test="courseDate != null">course_date,</if>
+            <if test="assess != null">assess,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="newId != null">#{newId},</if>
+            <if test="courseCode != null">#{courseCode},</if>
+            <if test="topic != null">#{topic},</if>
+            <if test="content != null">#{content},</if>
+            <if test="courseDay != null">#{courseDay},</if>
+            <if test="courseHour != null">#{courseHour},</if>
+            <if test="detailPlan != null">#{detailPlan},</if>
+            <if test="trainer != null">#{trainer},</if>
+            <if test="courseDate != null">#{courseDate},</if>
+            <if test="assess != null">#{assess},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTsYsplanTmpl" parameterType="TTsYsplanTmpl">
+        update t_ts_ysplan_tmpl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newId != null">new_id = #{newId},</if>
+            <if test="courseCode != null">course_code = #{courseCode},</if>
+            <if test="topic != null">topic = #{topic},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="courseDay != null">course_day = #{courseDay},</if>
+            <if test="courseHour != null">course_hour = #{courseHour},</if>
+            <if test="detailPlan != null">detail_plan = #{detailPlan},</if>
+            <if test="trainer != null">trainer = #{trainer},</if>
+            <if test="courseDate != null">course_date = #{courseDate},</if>
+            <if test="assess != null">assess = #{assess},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTsYsplanTmplById" parameterType="Long">
+        update t_ts_ysplan_tmpl set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTsYsplanTmplByIds" parameterType="String">
+        update t_ts_ysplan_tmpl set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/bccnew/firstplan.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询进组培训列表
+export function listFirstplan(query) {
+  return request({
+    url: '/bccnew/firstplan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询进组培训详细
+export function getFirstplan(id) {
+  return request({
+    url: '/bccnew/firstplan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增进组培训
+export function addFirstplan(data) {
+  return request({
+    url: '/bccnew/firstplan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改进组培训
+export function updateFirstplan(data) {
+  return request({
+    url: '/bccnew/firstplan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除进组培训
+export function delFirstplan(id) {
+  return request({
+    url: '/bccnew/firstplan/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出进组培训
+export function exportFirstplan(query) {
+  return request({
+    url: '/bccnew/firstplan/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询分离培训模版列表
+export function listFlPlan(query) {
+  return request({
+    url: '/training/flPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分离培训模版详细
+export function getFlPlan(id) {
+  return request({
+    url: '/training/flPlan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增分离培训模版
+export function addFlPlan(data) {
+  return request({
+    url: '/training/flPlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分离培训模版
+export function updateFlPlan(data) {
+  return request({
+    url: '/training/flPlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分离培训模版
+export function delFlPlan(id) {
+  return request({
+    url: '/training/flPlan/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出分离培训模版
+export function exportFlPlan(query) {
+  return request({
+    url: '/training/flPlan/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询分离培训列表
+export function listFlplandsdt(query) {
+  return request({
+    url: '/bccnew/flplandsdt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分离培训详细
+export function getFlplandsdt(id) {
+  return request({
+    url: '/bccnew/flplandsdt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增分离培训
+export function addFlplandsdt(data) {
+  return request({
+    url: '/bccnew/flplandsdt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分离培训
+export function updateFlplandsdt(data) {
+  return request({
+    url: '/bccnew/flplandsdt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分离培训
+export function delFlplandsdt(id) {
+  return request({
+    url: '/bccnew/flplandsdt/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出分离培训
+export function exportFlplandsdt(query) {
+  return request({
+    url: '/bccnew/flplandsdt/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询芳烃培训模版列表
+export function listFtPlan(query) {
+  return request({
+    url: '/bccnew/ftPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询芳烃培训模版详细
+export function getFtPlan(id) {
+  return request({
+    url: '/bccnew/ftPlan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增芳烃培训模版
+export function addFtPlan(data) {
+  return request({
+    url: '/bccnew/ftPlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改芳烃培训模版
+export function updateFtPlan(data) {
+  return request({
+    url: '/bccnew/ftPlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除芳烃培训模版
+export function delFtPlan(id) {
+  return request({
+    url: '/bccnew/ftPlan/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出芳烃培训模版
+export function exportFtPlan(query) {
+  return request({
+    url: '/bccnew/ftPlan/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询芳烃培训列表
+export function listFtplandsdt(query) {
+  return request({
+    url: '/bccnew/ftplandsdt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询芳烃培训详细
+export function getFtplandsdt(id) {
+  return request({
+    url: '/bccnew/ftplandsdt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增芳烃培训
+export function addFtplandsdt(data) {
+  return request({
+    url: '/bccnew/ftplandsdt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改芳烃培训
+export function updateFtplandsdt(data) {
+  return request({
+    url: '/bccnew/ftplandsdt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除芳烃培训
+export function delFtplandsdt(id) {
+  return request({
+    url: '/bccnew/ftplandsdt/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出芳烃培训
+export function exportFtplandsdt(query) {
+  return request({
+    url: '/bccnew/ftplandsdt/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询裂解培训模版列表
+export function listLjPlan(query) {
+  return request({
+    url: '/bccnew/ljPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询裂解培训模版详细
+export function getLjPlan(id) {
+  return request({
+    url: '/bccnew/ljPlan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增裂解培训模版
+export function addLjPlan(data) {
+  return request({
+    url: '/bccnew/ljPlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改裂解培训模版
+export function updateLjPlan(data) {
+  return request({
+    url: '/bccnew/ljPlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除裂解培训模版
+export function delLjPlan(id) {
+  return request({
+    url: '/bccnew/ljPlan/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出裂解培训模版
+export function exportLjPlan(query) {
+  return request({
+    url: '/bccnew/ljPlan/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询裂解培训列表
+export function listLjplandsdt(query) {
+  return request({
+    url: '/bccnew/ljplandsdt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询裂解培训详细
+export function getLjplandsdt(id) {
+  return request({
+    url: '/bccnew/ljplandsdt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增裂解培训
+export function addLjplandsdt(data) {
+  return request({
+    url: '/bccnew/ljplandsdt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改裂解培训
+export function updateLjplandsdt(data) {
+  return request({
+    url: '/bccnew/ljplandsdt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除裂解培训
+export function delLjplandsdt(id) {
+  return request({
+    url: '/bccnew/ljplandsdt/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出裂解培训
+export function exportLjplandsdt(query) {
+  return request({
+    url: '/bccnew/ljplandsdt/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询压缩培训模版列表
+export function listYaPlan(query) {
+  return request({
+    url: '/bccnew/yaPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询压缩培训模版详细
+export function getYaPlan(id) {
+  return request({
+    url: '/bccnew/yaPlan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增压缩培训模版
+export function addYaPlan(data) {
+  return request({
+    url: '/bccnew/yaPlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改压缩培训模版
+export function updateYaPlan(data) {
+  return request({
+    url: '/bccnew/yaPlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除压缩培训模版
+export function delYaPlan(id) {
+  return request({
+    url: '/bccnew/yaPlan/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出压缩培训模版
+export function exportYaPlan(query) {
+  return request({
+    url: '/bccnew/yaPlan/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询转岗培训列表
+export function listYsplandsdt(query) {
+  return request({
+    url: '/bccnew/ysplandsdt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询转岗培训详细
+export function getYsplandsdt(id) {
+  return request({
+    url: '/bccnew/ysplandsdt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增转岗培训
+export function addYsplandsdt(data) {
+  return request({
+    url: '/bccnew/ysplandsdt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改转岗培训
+export function updateYsplandsdt(data) {
+  return request({
+    url: '/bccnew/ysplandsdt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除转岗培训
+export function delYsplandsdt(id) {
+  return request({
+    url: '/bccnew/ysplandsdt/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出转岗培训
+export function exportYsplandsdt(query) {
+  return request({
+    url: '/bccnew/ysplandsdt/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/router/index.js

@@ -333,6 +333,19 @@ export const constantRoutes = [
       },
     ]
   },
+  {
+    path: '/training/bccnew',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'trainingPlan/:newId(\\d+)',
+        component: (resolve) => require(['@/views/training/bccnew/tsnew/trainingPlan.vue'], resolve),
+        name: 'trainingPlan',
+        meta: { title: '导师带徒培训计划' }
+      },
+    ]
+  },
   {
     path: '/production',
     component: Layout,

ui/src/views/apply/safetychange/index.vue

@@ -243,7 +243,7 @@
             :fetch-suggestions="getReason"></el-autocomplete>
         </el-form-item>
         <el-form-item label="破锁编号" prop="lockNo">
-          <el-select v-model="form.lockNo" placeholder="请选择锁编号" multiple clearable size="small" filterable
+          <el-select v-model="form.lockNo" placeholder="请选择锁编号" clearable size="small" filterable
                      style="width: 100%">
             <el-option
               v-for="item in lockList"
@@ -842,7 +842,7 @@ export default {
               this.getList();
             });
           } else {
-            this.form.lockNo = this.form.lockNo.join(',');
+            // this.form.lockNo = this.form.lockNo.join(',');
             console.log(this.form.lockNo)
             addSafetychange(this.form).then(response => {
               this.msgSuccess("新增成功");

ui/src/views/bccnew/firstplan/index.vue

@@ -0,0 +1,619 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="培训员工编号" prop="newId">
+        <el-input
+          v-model="queryParams.newId"
+          placeholder="请输入培训员工编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="课程编号" prop="courseCode">
+        <el-input
+          v-model="queryParams.courseCode"
+          placeholder="请输入课程编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训主题" prop="topic">
+        <el-input
+          v-model="queryParams.topic"
+          placeholder="请输入培训主题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训天" prop="courseDay">
+        <el-input
+          v-model="queryParams.courseDay"
+          placeholder="请输入培训天"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训小时" prop="courseHour">
+        <el-input
+          v-model="queryParams.courseHour"
+          placeholder="请输入培训小时"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训类型" prop="courseType">
+        <el-select v-model="queryParams.courseType" placeholder="请选择培训类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="讲师" prop="trainer">
+        <el-input
+          v-model="queryParams.trainer"
+          placeholder="请输入讲师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训日期" prop="courseDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.courseDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择培训日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="考核情况" prop="assess">
+        <el-input
+          v-model="queryParams.assess"
+          placeholder="请输入考核情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createrCode">
+        <el-input
+          v-model="queryParams.createrCode"
+          placeholder="请输入创建人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="修改人" prop="updaterCode">
+        <el-input
+          v-model="queryParams.updaterCode"
+          placeholder="请输入修改人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatedate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.updatedate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择修改时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门编号" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训状态" prop="planStatus">
+        <el-select v-model="queryParams.planStatus" placeholder="请选择培训状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['bccnew:firstplan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bccnew:firstplan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bccnew:firstplan:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['bccnew:firstplan:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['bccnew:firstplan:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="firstplanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训类型" align="center" prop="courseType" :show-overflow-tooltip="true"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['bccnew:firstplan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['bccnew:firstplan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改进组培训对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="培训员工编号" prop="newId">
+          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
+        </el-form-item>
+        <el-form-item label="课程编号" prop="courseCode">
+          <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
+        </el-form-item>
+        <el-form-item label="培训主题" prop="topic">
+          <el-input v-model="form.topic" placeholder="请输入培训主题" />
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="培训天" prop="courseDay">
+          <el-input v-model="form.courseDay" placeholder="请输入培训天" />
+        </el-form-item>
+        <el-form-item label="培训小时" prop="courseHour">
+          <el-input v-model="form.courseHour" placeholder="请输入培训小时" />
+        </el-form-item>
+        <el-form-item label="培训类型" prop="courseType">
+          <el-select v-model="form.courseType" placeholder="请选择培训类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="讲师" prop="trainer">
+          <el-input v-model="form.trainer" placeholder="请输入讲师" />
+        </el-form-item>
+        <el-form-item label="培训日期" prop="courseDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.courseDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择培训日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核情况" prop="assess">
+          <el-input v-model="form.assess" placeholder="请输入考核情况" />
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createrCode">
+          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.createdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="修改人" prop="updaterCode">
+          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="修改时间" prop="updatedate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.updatedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门编号" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="培训状态">
+          <el-radio-group v-model="form.planStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFirstplan, getFirstplan, delFirstplan, addFirstplan, updateFirstplan, exportFirstplan, importTemplate} from "@/api/bccnew/firstplan";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor';
+
+export default {
+  name: "Firstplan",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 进组培训表格数据
+      firstplanList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/bccnew/firstplan/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        courseType: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null,
+        planStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询进组培训列表 */
+    getList() {
+      this.loading = true;
+      listFirstplan(this.queryParams).then(response => {
+        this.firstplanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        courseType: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null,
+        planStatus: 0
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加进组培训";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFirstplan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改进组培训";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFirstplan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFirstplan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delFirstplan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有进组培训数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportFirstplan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

ui/src/views/training/bccnew/flPlan/index.vue

@@ -0,0 +1,594 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="培训员工编号" prop="newId">
+        <el-input
+          v-model="queryParams.newId"
+          placeholder="请输入培训员工编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="课程编号" prop="courseCode">
+        <el-input
+          v-model="queryParams.courseCode"
+          placeholder="请输入课程编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训主题" prop="topic">
+        <el-input
+          v-model="queryParams.topic"
+          placeholder="请输入培训主题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训天" prop="courseDay">
+        <el-input
+          v-model="queryParams.courseDay"
+          placeholder="请输入培训天"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训小时" prop="courseHour">
+        <el-input
+          v-model="queryParams.courseHour"
+          placeholder="请输入培训小时"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细计划" prop="detailPlan">
+        <el-input
+          v-model="queryParams.detailPlan"
+          placeholder="请输入详细计划"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="讲师" prop="trainer">
+        <el-input
+          v-model="queryParams.trainer"
+          placeholder="请输入讲师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训日期" prop="courseDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.courseDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择培训日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="考核情况" prop="assess">
+        <el-input
+          v-model="queryParams.assess"
+          placeholder="请输入考核情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createrCode">
+        <el-input
+          v-model="queryParams.createrCode"
+          placeholder="请输入创建人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="修改人" prop="updaterCode">
+        <el-input
+          v-model="queryParams.updaterCode"
+          placeholder="请输入修改人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatedate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.updatedate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择修改时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门编号" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['training:flPlan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['training:flPlan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['training:flPlan:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['training:flPlan:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['training:flPlan:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="flPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
+      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['training:flPlan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['training:flPlan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改分离培训模版对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="培训员工编号" prop="newId">
+          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
+        </el-form-item>
+        <el-form-item label="课程编号" prop="courseCode">
+          <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
+        </el-form-item>
+        <el-form-item label="培训主题" prop="topic">
+          <el-input v-model="form.topic" placeholder="请输入培训主题" />
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="培训天" prop="courseDay">
+          <el-input v-model="form.courseDay" placeholder="请输入培训天" />
+        </el-form-item>
+        <el-form-item label="培训小时" prop="courseHour">
+          <el-input v-model="form.courseHour" placeholder="请输入培训小时" />
+        </el-form-item>
+        <el-form-item label="详细计划" prop="detailPlan">
+          <el-input v-model="form.detailPlan" placeholder="请输入详细计划" />
+        </el-form-item>
+        <el-form-item label="讲师" prop="trainer">
+          <el-input v-model="form.trainer" placeholder="请输入讲师" />
+        </el-form-item>
+        <el-form-item label="培训日期" prop="courseDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.courseDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择培训日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核情况" prop="assess">
+          <el-input v-model="form.assess" placeholder="请输入考核情况" />
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createrCode">
+          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.createdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="修改人" prop="updaterCode">
+          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="修改时间" prop="updatedate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.updatedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门编号" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFlPlan, getFlPlan, delFlPlan, addFlPlan, updateFlPlan, exportFlPlan, importTemplate} from "@/api/training/bccnew/flPlan";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor/index.vue';
+
+export default {
+  name: "FlPlan",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 分离培训模版表格数据
+      flPlanList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/training/flPlan/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询分离培训模版列表 */
+    getList() {
+      this.loading = true;
+      listFlPlan(this.queryParams).then(response => {
+        this.flPlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加分离培训模版";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFlPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改分离培训模版";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFlPlan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFlPlan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delFlPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有分离培训模版数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportFlPlan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

ui/src/views/training/bccnew/ftPlan/index.vue

@@ -0,0 +1,497 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="课程编号" prop="courseCode">
+        <el-input
+          v-model="queryParams.courseCode"
+          placeholder="请输入课程编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="讲师" prop="trainer">
+        <el-input
+          v-model="queryParams.trainer"
+          placeholder="请输入讲师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训日期" prop="courseDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.courseDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择培训日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="考核情况" prop="assess">
+        <el-input
+          v-model="queryParams.assess"
+          placeholder="请输入考核情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['bccnew:ftPlan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bccnew:ftPlan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bccnew:ftPlan:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['bccnew:ftPlan:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['bccnew:ftPlan:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ftPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
+      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['bccnew:ftPlan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['bccnew:ftPlan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改芳烃培训模版对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="培训员工编号" prop="newId">
+          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
+        </el-form-item>
+        <el-form-item label="课程编号" prop="courseCode">
+          <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
+        </el-form-item>
+        <el-form-item label="培训主题" prop="topic">
+          <el-input v-model="form.topic" placeholder="请输入培训主题" />
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="培训天" prop="courseDay">
+          <el-input v-model="form.courseDay" placeholder="请输入培训天" />
+        </el-form-item>
+        <el-form-item label="培训小时" prop="courseHour">
+          <el-input v-model="form.courseHour" placeholder="请输入培训小时" />
+        </el-form-item>
+        <el-form-item label="详细计划" prop="detailPlan">
+          <el-input v-model="form.detailPlan" placeholder="请输入详细计划" />
+        </el-form-item>
+        <el-form-item label="讲师" prop="trainer">
+          <el-input v-model="form.trainer" placeholder="请输入讲师" />
+        </el-form-item>
+        <el-form-item label="培训日期" prop="courseDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.courseDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择培训日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核情况" prop="assess">
+          <el-input v-model="form.assess" placeholder="请输入考核情况" />
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createrCode">
+          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.createdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="修改人" prop="updaterCode">
+          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="修改时间" prop="updatedate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.updatedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门编号" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFtPlan, getFtPlan, delFtPlan, addFtPlan, updateFtPlan, exportFtPlan, importTemplate} from "@/api/training/bccnew/ftPlan";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor/index.vue';
+
+export default {
+  name: "FtPlan",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 芳烃培训模版表格数据
+      ftPlanList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/bccnew/ftPlan/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询芳烃培训模版列表 */
+    getList() {
+      this.loading = true;
+      listFtPlan(this.queryParams).then(response => {
+        this.ftPlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加芳烃培训模版";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFtPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改芳烃培训模版";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFtPlan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFtPlan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delFtPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有芳烃培训模版数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportFtPlan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

ui/src/views/training/bccnew/ljPlan/index.vue

@@ -0,0 +1,608 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="培训员工编号" prop="newId">
+        <el-input
+          v-model="queryParams.newId"
+          placeholder="请输入培训员工编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="课程编号" prop="courseCode">
+        <el-input
+          v-model="queryParams.courseCode"
+          placeholder="请输入课程编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训主题" prop="topic">
+        <el-input
+          v-model="queryParams.topic"
+          placeholder="请输入培训主题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训天" prop="courseDay">
+        <el-input
+          v-model="queryParams.courseDay"
+          placeholder="请输入培训天"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训小时" prop="courseHour">
+        <el-input
+          v-model="queryParams.courseHour"
+          placeholder="请输入培训小时"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细计划" prop="detailPlan">
+        <el-input
+          v-model="queryParams.detailPlan"
+          placeholder="请输入详细计划"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="讲师" prop="trainer">
+        <el-input
+          v-model="queryParams.trainer"
+          placeholder="请输入讲师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训日期" prop="courseDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.courseDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择培训日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="考核情况" prop="assess">
+        <el-input
+          v-model="queryParams.assess"
+          placeholder="请输入考核情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createrCode">
+        <el-input
+          v-model="queryParams.createrCode"
+          placeholder="请输入创建人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="修改人" prop="updaterCode">
+        <el-input
+          v-model="queryParams.updaterCode"
+          placeholder="请输入修改人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatedate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.updatedate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择修改时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门编号" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['bccnew:ljPlan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bccnew:ljPlan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bccnew:ljPlan:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['bccnew:ljPlan:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['bccnew:ljPlan:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ljPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
+      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['bccnew:ljPlan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['bccnew:ljPlan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改裂解培训模版对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="培训员工编号" prop="newId">
+          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
+        </el-form-item>
+        <el-form-item label="课程编号" prop="courseCode">
+          <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
+        </el-form-item>
+        <el-form-item label="培训主题" prop="topic">
+          <el-input v-model="form.topic" placeholder="请输入培训主题" />
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="培训天" prop="courseDay">
+          <el-input v-model="form.courseDay" placeholder="请输入培训天" />
+        </el-form-item>
+        <el-form-item label="培训小时" prop="courseHour">
+          <el-input v-model="form.courseHour" placeholder="请输入培训小时" />
+        </el-form-item>
+        <el-form-item label="详细计划" prop="detailPlan">
+          <el-input v-model="form.detailPlan" placeholder="请输入详细计划" />
+        </el-form-item>
+        <el-form-item label="讲师" prop="trainer">
+          <el-input v-model="form.trainer" placeholder="请输入讲师" />
+        </el-form-item>
+        <el-form-item label="培训日期" prop="courseDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.courseDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择培训日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核情况" prop="assess">
+          <el-input v-model="form.assess" placeholder="请输入考核情况" />
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createrCode">
+          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.createdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="修改人" prop="updaterCode">
+          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="修改时间" prop="updatedate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.updatedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门编号" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLjPlan, getLjPlan, delLjPlan, addLjPlan, updateLjPlan, exportLjPlan, importTemplate} from "@/api/training/bccnew/ljPlan";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor/index.vue';
+
+export default {
+  name: "LjPlan",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 裂解培训模版表格数据
+      ljPlanList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/bccnew/ljPlan/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询裂解培训模版列表 */
+    getList() {
+      this.loading = true;
+      listLjPlan(this.queryParams).then(response => {
+        this.ljPlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加裂解培训模版";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLjPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改裂解培训模版";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLjPlan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLjPlan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delLjPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有裂解培训模版数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportLjPlan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

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

@@ -130,7 +130,7 @@
       </el-table-column>
       <!--      <el-table-column label="导师员工编号" align="center" prop="mentorStaffId" :show-overflow-tooltip="true"/>-->
       <el-table-column label="导师" align="center" prop="mentorStaffName" width="100" />
-      <el-table-column label="培训类型" align="center" prop="planType" width="100">
+      <el-table-column label="岗位" align="center" prop="planType" width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.planType == 1" size="small" type="success">裂解</span>
             <span v-else-if="scope.row.planType == 2" size="small" type="success">压缩</span>
@@ -248,23 +248,23 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="培训类型" prop="planType">
+        <el-form-item label="岗位" prop="planType">
           <el-radio-group v-model="form.planType">
             <el-radio
               key="1"
-              label="裂解"
+              :label="1"
             >裂解</el-radio>
             <el-radio
               key="2"
-              label="压缩"
+              :label="2"
             >压缩</el-radio>
             <el-radio
               key="3"
-              label="分离"
+              :label="3"
             >分离</el-radio>
             <el-radio
               key="4"
-              label="芳烃"
+              :label="4"
             >芳烃</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -534,7 +534,7 @@ export default {
     /** 查询新员工培训列表 */
     getList() {
       this.loading = true;
-      listTnNew(this.queryParams).then(response => {
+      listTsnew(this.queryParams).then(response => {
         this.tnNewList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -599,7 +599,7 @@ export default {
     },
     planList(row){
       const newId = row.newId
-      this.$router.push("/training/newstaff/planList/" + newId);
+      this.$router.push("/training/bccnew/trainingPlan/" + newId);
     },
     /** 新增按钮操作 */
     handleAdd() {

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

@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['bccnew:flplandsdt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bccnew:flplandsdt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bccnew:flplandsdt:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table v-loading="loading" :data="dsdtList" :height="clientHeight" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="55" align="center" fixed="left"/>
+      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true" fixed="left"/>
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true" fixed="left"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true" fixed="left"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
+      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true"/>
+      <el-table-column label="第二次成绩" align="center" prop="score2" :show-overflow-tooltip="true"/>
+      <el-table-column label="第三次成绩" align="center" prop="score3" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:{
+    newId:{
+
+    },
+    traniningType:{
+
+    }
+  },
+  data() {
+    return {
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      loading:true,
+      clientHeight: 300,
+      dsdtList:[],
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight -250
+    })
+
+  },
+  methods:{
+    getList(){},
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+  }
+};
+
+
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container" style="padding: 0 0 0 0">
+    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="进组前培训" name="first">
+        <list item="1" typename="firstplan" v-if="isFirst"></list>
+      </el-tab-pane>
+      <el-tab-pane label="裂解" name="second" v-if="planType == 1">
+        <score :newId="newId" v-if="isSecond"/>
+      </el-tab-pane>
+      <el-tab-pane label="压缩" name="third" v-if="planType == 2">
+        <score :newId="newId" v-if="isThird"/>
+      </el-tab-pane>
+      <el-tab-pane label="分离" name="fourth" v-if="planType == 3">
+        <score :newId="newId" v-if="isFourth"/>
+      </el-tab-pane>
+      <el-tab-pane label="芳烃" name="fifth" v-if="planType == 4">
+        <score :newId="newId" v-if="isFifth"/>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+import List from "@/views/training/newstaff/firstplan/index.vue";
+import Score from "@/views/training/bccnew/tsnew/score.vue";
+import {getTnNew} from "@/api/training/newstaff/tnNew";
+import {listLjplandsdt} from "@/api/training/bccnew/ljplandsdt";
+import {listYsplandsdt} from "@/api/training/bccnew/ysplandsdt";
+import {listFlplandsdt} from "@/api/training/bccnew/flplandsdt";
+import {listFtplandsdt} from "@/api/training/bccnew/ftplandsdt";
+
+export default {
+  name: "trainingPlan",
+  components: {Score, List},
+  data() {
+    return {
+      dsdtList: [],
+      clientHeight: 300,
+      // 默认第一个Tab
+      activeName: 'first',
+      isFirst: true,
+      isSecond: false,
+      isThird: false,
+      isFourth: false,
+      isFifth: false,
+      isSixth: false,
+      planType: 1,
+      newId: ''
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.newId = this.$route.params && this.$route.params.newId;
+    getTnNew(this.newId).then(response => {
+      this.planType = response.data.planType;
+    });
+  },
+  methods: {
+    handleClick(tab) {
+      console.log(tab.name)
+      this.dsdtList = [];
+      if (tab.name === 'first') {
+        listLjplandsdt({newId: this.newId}).then(res => {
+          this.dsdtList = res.data;
+        })
+        this.isFirst = true
+        this.isSecond = false
+        this.isThird = false
+        this.isFourth = false
+        this.isFifth = false
+        this.isSix1th = false
+      } else if (tab.name === 'second') {
+        listYsplandsdt({newId: this.newId}).then(res => {
+          this.dsdtList = res.data;
+        })
+        this.isFirst = false
+        this.isSecond = true
+        this.isThird = false
+        this.isFourth = false
+        this.isFifth = false
+        this.isSixth = false
+      } else if (tab.name === 'third') {
+        listFlplandsdt({newId: this.newId}).then(res => {
+          this.dsdtList = res.data;
+        })
+        this.isFirst = false
+        this.isSecond = false
+        this.isThird = true
+        this.isFourth = false
+        this.isFifth = false
+        this.isSixth = false
+      } else if (tab.name === 'fourth') {
+        listFtplandsdt({newId: this.newId}).then(res => {
+          this.dsdtList = res.data;
+        })
+        this.isFirst = false
+        this.isSecond = false
+        this.isThird = false
+        this.isFourth = true
+        this.isFifth = false
+        this.isSixth = false
+      } else if (tab.name === 'fifth') {
+        listLjplandsdt({newId: this.newId}).then(res => {
+          this.dsdtList = res.data;
+        })
+        this.isFirst = false
+        this.isSecond = false
+        this.isThird = false
+        this.isFourth = false
+        this.isFifth = true
+        this.isSixth = false
+      } else if (tab.name === 'sixth') {
+        listLjplandsdt({newId: this.newId}).then(res => {
+          this.dsdtList = res.data;
+        })
+        this.isFirst = false
+        this.isSecond = false
+        this.isThird = false
+        this.isFourth = false
+        this.isFifth = false
+        this.isSixth = true
+      }
+    }
+  }
+};
+</script>
+<style scoped>
+
+</style>

ui/src/views/training/bccnew/yaPlan/index.vue

@@ -0,0 +1,608 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="培训员工编号" prop="newId">
+        <el-input
+          v-model="queryParams.newId"
+          placeholder="请输入培训员工编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="课程编号" prop="courseCode">
+        <el-input
+          v-model="queryParams.courseCode"
+          placeholder="请输入课程编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训主题" prop="topic">
+        <el-input
+          v-model="queryParams.topic"
+          placeholder="请输入培训主题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训天" prop="courseDay">
+        <el-input
+          v-model="queryParams.courseDay"
+          placeholder="请输入培训天"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训小时" prop="courseHour">
+        <el-input
+          v-model="queryParams.courseHour"
+          placeholder="请输入培训小时"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细计划" prop="detailPlan">
+        <el-input
+          v-model="queryParams.detailPlan"
+          placeholder="请输入详细计划"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="讲师" prop="trainer">
+        <el-input
+          v-model="queryParams.trainer"
+          placeholder="请输入讲师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训日期" prop="courseDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.courseDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择培训日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="考核情况" prop="assess">
+        <el-input
+          v-model="queryParams.assess"
+          placeholder="请输入考核情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createrCode">
+        <el-input
+          v-model="queryParams.createrCode"
+          placeholder="请输入创建人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="修改人" prop="updaterCode">
+        <el-input
+          v-model="queryParams.updaterCode"
+          placeholder="请输入修改人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatedate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.updatedate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择修改时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门编号" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['bccnew:yaPlan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bccnew:yaPlan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bccnew:yaPlan:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['bccnew:yaPlan:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['bccnew:yaPlan:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="yaPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
+      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['bccnew:yaPlan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['bccnew:yaPlan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改压缩培训模版对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="培训员工编号" prop="newId">
+          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
+        </el-form-item>
+        <el-form-item label="课程编号" prop="courseCode">
+          <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
+        </el-form-item>
+        <el-form-item label="培训主题" prop="topic">
+          <el-input v-model="form.topic" placeholder="请输入培训主题" />
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="培训天" prop="courseDay">
+          <el-input v-model="form.courseDay" placeholder="请输入培训天" />
+        </el-form-item>
+        <el-form-item label="培训小时" prop="courseHour">
+          <el-input v-model="form.courseHour" placeholder="请输入培训小时" />
+        </el-form-item>
+        <el-form-item label="详细计划" prop="detailPlan">
+          <el-input v-model="form.detailPlan" placeholder="请输入详细计划" />
+        </el-form-item>
+        <el-form-item label="讲师" prop="trainer">
+          <el-input v-model="form.trainer" placeholder="请输入讲师" />
+        </el-form-item>
+        <el-form-item label="培训日期" prop="courseDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.courseDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择培训日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核情况" prop="assess">
+          <el-input v-model="form.assess" placeholder="请输入考核情况" />
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createrCode">
+          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.createdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="修改人" prop="updaterCode">
+          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="修改时间" prop="updatedate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.updatedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门编号" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listYaPlan, getYaPlan, delYaPlan, addYaPlan, updateYaPlan, exportYaPlan, importTemplate} from "@/api/training/bccnew/yaPlan";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from '@/components/Editor/index.vue';
+
+export default {
+  name: "YaPlan",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 压缩培训模版表格数据
+      yaPlanList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/bccnew/yaPlan/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询压缩培训模版列表 */
+    getList() {
+      this.loading = true;
+      listYaPlan(this.queryParams).then(response => {
+        this.yaPlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        newId: null,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加压缩培训模版";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getYaPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改压缩培训模版";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateYaPlan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addYaPlan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delYaPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有压缩培训模版数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportYaPlan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>