LY 新员工培训

master/src/main/java/com/ruoyi/project/training/newstaff/controller/TTnFirstplanTmplController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.newstaff.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.newstaff.domain.TTnFirstplanTmpl;
+import com.ruoyi.project.training.newstaff.service.ITTnFirstplanTmplService;
+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 ruoyi
+ * @date 2023-06-29
+ */
+@RestController
+@RequestMapping("/newstaff/firstplantmpl")
+public class TTnFirstplanTmplController extends BaseController
+{
+    @Autowired
+    private ITTnFirstplanTmplService tTnFirstplanTmplService;
+
+    /**
+     * 查询进组培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplantmpl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        startPage();
+        List<TTnFirstplanTmpl> list = tTnFirstplanTmplService.selectTTnFirstplanTmplList(tTnFirstplanTmpl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出进组培训模版列表
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplantmpl:export')")
+    @Log(title = "进组培训模版", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        List<TTnFirstplanTmpl> list = tTnFirstplanTmplService.selectTTnFirstplanTmplList(tTnFirstplanTmpl);
+        ExcelUtil<TTnFirstplanTmpl> util = new ExcelUtil<TTnFirstplanTmpl>(TTnFirstplanTmpl.class);
+        return util.exportExcel(list, "firstplantmpl");
+    }
+
+    /**
+     * 获取进组培训模版详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplantmpl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTnFirstplanTmplService.selectTTnFirstplanTmplById(id));
+    }
+
+    /**
+     * 新增进组培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplantmpl:add')")
+    @Log(title = "进组培训模版", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        return toAjax(tTnFirstplanTmplService.insertTTnFirstplanTmpl(tTnFirstplanTmpl));
+    }
+
+    /**
+     * 修改进组培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplantmpl:edit')")
+    @Log(title = "进组培训模版", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        return toAjax(tTnFirstplanTmplService.updateTTnFirstplanTmpl(tTnFirstplanTmpl));
+    }
+
+    /**
+     * 删除进组培训模版
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplantmpl:remove')")
+    @Log(title = "进组培训模版", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTnFirstplanTmplService.deleteTTnFirstplanTmplByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/training/newstaff/controller/TTnNewController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.project.training.newstaff.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.newstaff.domain.TTnNew;
+import com.ruoyi.project.training.newstaff.service.ITTnNewService;
+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 ruoyi
+ * @date 2023-06-29
+ */
+@RestController
+@RequestMapping("/newstaff/tnNew")
+public class TTnNewController extends BaseController
+{
+    @Autowired
+    private ITTnNewService tTnNewService;
+
+    /**
+     * 查询新员工培训列表
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:tnNew:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTnNew tTnNew)
+    {
+        startPage();
+        List<TTnNew> list = tTnNewService.selectTTnNewList(tTnNew);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出新员工培训列表
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:tnNew:export')")
+    @Log(title = "新员工培训", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTnNew tTnNew)
+    {
+        List<TTnNew> list = tTnNewService.selectTTnNewList(tTnNew);
+        ExcelUtil<TTnNew> util = new ExcelUtil<TTnNew>(TTnNew.class);
+        return util.exportExcel(list, "tnNew");
+    }
+
+    /**
+     * 获取新员工培训详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:tnNew:query')")
+    @GetMapping(value = "/{newId}")
+    public AjaxResult getInfo(@PathVariable("newId") Long newId)
+    {
+        return AjaxResult.success(tTnNewService.selectTTnNewById(newId));
+    }
+
+    /**
+     * 新增新员工培训
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:tnNew:add')")
+    @Log(title = "新员工培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTnNew tTnNew)
+    {
+        return toAjax(tTnNewService.insertTTnNew(tTnNew));
+    }
+
+    /**
+     * 修改新员工培训
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:tnNew:edit')")
+    @Log(title = "新员工培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTnNew tTnNew)
+    {
+        return toAjax(tTnNewService.updateTTnNew(tTnNew));
+    }
+
+    /**
+     * 删除新员工培训
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:tnNew:remove')")
+    @Log(title = "新员工培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{newIds}")
+    public AjaxResult remove(@PathVariable Long[] newIds)
+    {
+        return toAjax(tTnNewService.deleteTTnNewByIds(newIds));
+    }
+}

master/src/main/java/com/ruoyi/project/training/newstaff/domain/TTnFirstplanTmpl.java

@@ -0,0 +1,276 @@
+package com.ruoyi.project.training.newstaff.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_tn_firstplan_tmpl
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+public class TTnFirstplanTmpl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 培训员工编号 */
+    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;
+
+    /** 创建人 */
+    private String createrCode;
+
+    /** 创建时间 */
+    private Date createdate;
+
+    /** 修改人 */
+    private String updaterCode;
+
+    /** 修改时间 */
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    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;
+    }
+
+    @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())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/training/newstaff/domain/TTnNew.java

@@ -0,0 +1,277 @@
+package com.ruoyi.project.training.newstaff.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_tn_new
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+public class TTnNew extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long newId;
+
+    /** 培训员工编号 */
+    @Excel(name = "培训员工编号")
+    private String staffId;
+
+    @Excel(name = "培训员工")
+    private String staffName;
+    /** 年度培训标题 */
+    @Excel(name = "年度培训标题")
+    private String name;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    private String createrCode;
+
+    /** 创建时间 */
+    private Date createdate;
+
+    /** 修改人 */
+    private String updaterCode;
+
+    /** 修改时间 */
+    private Date updatedate;
+
+    /** 部门编号 */
+    private Long deptId;
+
+    /** 培训状态 */
+    @Excel(name = "培训状态")
+    private Long planStatus;
+
+    /** 年份 */
+    private Long planYear;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startdate;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date enddate;
+
+    /** 导师员工编号 */
+    @Excel(name = "导师员工编号")
+    private String mentorStaffId;
+
+    /** 导师员工编号 */
+    @Excel(name = "导师")
+    private String mentorStaffName;
+
+    /** 培训类型 1-新员工 2-转岗 */
+    @Excel(name = "培训类型 1-新员工 2-转岗")
+    private Long planType;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public void setNewId(Long newId)
+    {
+        this.newId = newId;
+    }
+
+    public Long getNewId()
+    {
+        return newId;
+    }
+    public void setStaffId(String staffId)
+    {
+        this.staffId = staffId;
+    }
+
+    public String getStaffId()
+    {
+        return staffId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    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 setPlanStatus(Long planStatus)
+    {
+        this.planStatus = planStatus;
+    }
+
+    public Long getPlanStatus()
+    {
+        return planStatus;
+    }
+    public void setPlanYear(Long planYear)
+    {
+        this.planYear = planYear;
+    }
+
+    public Long getPlanYear()
+    {
+        return planYear;
+    }
+    public void setStartdate(Date startdate)
+    {
+        this.startdate = startdate;
+    }
+
+    public Date getStartdate()
+    {
+        return startdate;
+    }
+    public void setEnddate(Date enddate)
+    {
+        this.enddate = enddate;
+    }
+
+    public Date getEnddate()
+    {
+        return enddate;
+    }
+    public void setMentorStaffId(String mentorStaffId)
+    {
+        this.mentorStaffId = mentorStaffId;
+    }
+
+    public String getMentorStaffId()
+    {
+        return mentorStaffId;
+    }
+    public void setPlanType(Long planType)
+    {
+        this.planType = planType;
+    }
+
+    public Long getPlanType()
+    {
+        return planType;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getMentorStaffName() {
+        return mentorStaffName;
+    }
+
+    public void setMentorStaffName(String mentorStaffName) {
+        this.mentorStaffName = mentorStaffName;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("newId", getNewId())
+            .append("staffId", getStaffId())
+            .append("name", getName())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("planStatus", getPlanStatus())
+            .append("planYear", getPlanYear())
+            .append("startdate", getStartdate())
+            .append("enddate", getEnddate())
+            .append("mentorStaffId", getMentorStaffId())
+            .append("planType", getPlanType())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/training/newstaff/mapper/TTnFirstplanTmplMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.training.newstaff.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.newstaff.domain.TTnFirstplanTmpl;
+
+/**
+ * 进组培训模版Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+public interface TTnFirstplanTmplMapper
+{
+    /**
+     * 查询进组培训模版
+     *
+     * @param id 进组培训模版ID
+     * @return 进组培训模版
+     */
+    public TTnFirstplanTmpl selectTTnFirstplanTmplById(Long id);
+
+    /**
+     * 查询进组培训模版列表
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 进组培训模版集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTnFirstplanTmpl> selectTTnFirstplanTmplList(TTnFirstplanTmpl tTnFirstplanTmpl);
+
+    /**
+     * 新增进组培训模版
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 结果
+     */
+    public int insertTTnFirstplanTmpl(TTnFirstplanTmpl tTnFirstplanTmpl);
+
+    /**
+     * 修改进组培训模版
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 结果
+     */
+    public int updateTTnFirstplanTmpl(TTnFirstplanTmpl tTnFirstplanTmpl);
+
+    /**
+     * 删除进组培训模版
+     *
+     * @param id 进组培训模版ID
+     * @return 结果
+     */
+    public int deleteTTnFirstplanTmplById(Long id);
+
+    /**
+     * 批量删除进组培训模版
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTnFirstplanTmplByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/training/newstaff/mapper/TTnNewMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.training.newstaff.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.newstaff.domain.TTnNew;
+
+/**
+ * 新员工培训Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+public interface TTnNewMapper
+{
+    /**
+     * 查询新员工培训
+     *
+     * @param newId 新员工培训ID
+     * @return 新员工培训
+     */
+    public TTnNew selectTTnNewById(Long newId);
+
+    /**
+     * 查询新员工培训列表
+     *
+     * @param tTnNew 新员工培训
+     * @return 新员工培训集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TTnNew> selectTTnNewList(TTnNew tTnNew);
+
+    /**
+     * 新增新员工培训
+     *
+     * @param tTnNew 新员工培训
+     * @return 结果
+     */
+    public int insertTTnNew(TTnNew tTnNew);
+
+    /**
+     * 修改新员工培训
+     *
+     * @param tTnNew 新员工培训
+     * @return 结果
+     */
+    public int updateTTnNew(TTnNew tTnNew);
+
+    /**
+     * 删除新员工培训
+     *
+     * @param newId 新员工培训ID
+     * @return 结果
+     */
+    public int deleteTTnNewById(Long newId);
+
+    /**
+     * 批量删除新员工培训
+     *
+     * @param newIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTnNewByIds(Long[] newIds);
+}

master/src/main/java/com/ruoyi/project/training/newstaff/service/ITTnFirstplanTmplService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.training.newstaff.service;
+
+import java.util.List;
+import com.ruoyi.project.training.newstaff.domain.TTnFirstplanTmpl;
+
+/**
+ * 进组培训模版Service接口
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+public interface ITTnFirstplanTmplService
+{
+    /**
+     * 查询进组培训模版
+     *
+     * @param id 进组培训模版ID
+     * @return 进组培训模版
+     */
+    public TTnFirstplanTmpl selectTTnFirstplanTmplById(Long id);
+
+    /**
+     * 查询进组培训模版列表
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 进组培训模版集合
+     */
+    public List<TTnFirstplanTmpl> selectTTnFirstplanTmplList(TTnFirstplanTmpl tTnFirstplanTmpl);
+
+    /**
+     * 新增进组培训模版
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 结果
+     */
+    public int insertTTnFirstplanTmpl(TTnFirstplanTmpl tTnFirstplanTmpl);
+
+    /**
+     * 修改进组培训模版
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 结果
+     */
+    public int updateTTnFirstplanTmpl(TTnFirstplanTmpl tTnFirstplanTmpl);
+
+    /**
+     * 批量删除进组培训模版
+     *
+     * @param ids 需要删除的进组培训模版ID
+     * @return 结果
+     */
+    public int deleteTTnFirstplanTmplByIds(Long[] ids);
+
+    /**
+     * 删除进组培训模版信息
+     *
+     * @param id 进组培训模版ID
+     * @return 结果
+     */
+    public int deleteTTnFirstplanTmplById(Long id);
+}

master/src/main/java/com/ruoyi/project/training/newstaff/service/ITTnNewService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.training.newstaff.service;
+
+import java.util.List;
+import com.ruoyi.project.training.newstaff.domain.TTnNew;
+
+/**
+ * 新员工培训Service接口
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+public interface ITTnNewService
+{
+    /**
+     * 查询新员工培训
+     *
+     * @param newId 新员工培训ID
+     * @return 新员工培训
+     */
+    public TTnNew selectTTnNewById(Long newId);
+
+    /**
+     * 查询新员工培训列表
+     *
+     * @param tTnNew 新员工培训
+     * @return 新员工培训集合
+     */
+    public List<TTnNew> selectTTnNewList(TTnNew tTnNew);
+
+    /**
+     * 新增新员工培训
+     *
+     * @param tTnNew 新员工培训
+     * @return 结果
+     */
+    public int insertTTnNew(TTnNew tTnNew);
+
+    /**
+     * 修改新员工培训
+     *
+     * @param tTnNew 新员工培训
+     * @return 结果
+     */
+    public int updateTTnNew(TTnNew tTnNew);
+
+    /**
+     * 批量删除新员工培训
+     *
+     * @param newIds 需要删除的新员工培训ID
+     * @return 结果
+     */
+    public int deleteTTnNewByIds(Long[] newIds);
+
+    /**
+     * 删除新员工培训信息
+     *
+     * @param newId 新员工培训ID
+     * @return 结果
+     */
+    public int deleteTTnNewById(Long newId);
+}

master/src/main/java/com/ruoyi/project/training/newstaff/service/impl/TTnFirstplanTmplServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.training.newstaff.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.newstaff.mapper.TTnFirstplanTmplMapper;
+import com.ruoyi.project.training.newstaff.domain.TTnFirstplanTmpl;
+import com.ruoyi.project.training.newstaff.service.ITTnFirstplanTmplService;
+
+/**
+ * 进组培训模版Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+@Service
+public class TTnFirstplanTmplServiceImpl implements ITTnFirstplanTmplService
+{
+    @Autowired
+    private TTnFirstplanTmplMapper tTnFirstplanTmplMapper;
+
+    /**
+     * 查询进组培训模版
+     *
+     * @param id 进组培训模版ID
+     * @return 进组培训模版
+     */
+    @Override
+    public TTnFirstplanTmpl selectTTnFirstplanTmplById(Long id)
+    {
+        return tTnFirstplanTmplMapper.selectTTnFirstplanTmplById(id);
+    }
+
+    /**
+     * 查询进组培训模版列表
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 进组培训模版
+     */
+    @Override
+    public List<TTnFirstplanTmpl> selectTTnFirstplanTmplList(TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        return tTnFirstplanTmplMapper.selectTTnFirstplanTmplList(tTnFirstplanTmpl);
+    }
+
+    /**
+     * 新增进组培训模版
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 结果
+     */
+    @Override
+    public int insertTTnFirstplanTmpl(TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        return tTnFirstplanTmplMapper.insertTTnFirstplanTmpl(tTnFirstplanTmpl);
+    }
+
+    /**
+     * 修改进组培训模版
+     *
+     * @param tTnFirstplanTmpl 进组培训模版
+     * @return 结果
+     */
+    @Override
+    public int updateTTnFirstplanTmpl(TTnFirstplanTmpl tTnFirstplanTmpl)
+    {
+        return tTnFirstplanTmplMapper.updateTTnFirstplanTmpl(tTnFirstplanTmpl);
+    }
+
+    /**
+     * 批量删除进组培训模版
+     *
+     * @param ids 需要删除的进组培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTnFirstplanTmplByIds(Long[] ids)
+    {
+        return tTnFirstplanTmplMapper.deleteTTnFirstplanTmplByIds(ids);
+    }
+
+    /**
+     * 删除进组培训模版信息
+     *
+     * @param id 进组培训模版ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTnFirstplanTmplById(Long id)
+    {
+        return tTnFirstplanTmplMapper.deleteTTnFirstplanTmplById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/training/newstaff/service/impl/TTnNewServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.training.newstaff.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.training.newstaff.mapper.TTnNewMapper;
+import com.ruoyi.project.training.newstaff.domain.TTnNew;
+import com.ruoyi.project.training.newstaff.service.ITTnNewService;
+
+/**
+ * 新员工培训Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-06-29
+ */
+@Service
+public class TTnNewServiceImpl implements ITTnNewService
+{
+    @Autowired
+    private TTnNewMapper tTnNewMapper;
+
+    /**
+     * 查询新员工培训
+     *
+     * @param newId 新员工培训ID
+     * @return 新员工培训
+     */
+    @Override
+    public TTnNew selectTTnNewById(Long newId)
+    {
+        return tTnNewMapper.selectTTnNewById(newId);
+    }
+
+    /**
+     * 查询新员工培训列表
+     *
+     * @param tTnNew 新员工培训
+     * @return 新员工培训
+     */
+    @Override
+    public List<TTnNew> selectTTnNewList(TTnNew tTnNew)
+    {
+        return tTnNewMapper.selectTTnNewList(tTnNew);
+    }
+
+    /**
+     * 新增新员工培训
+     *
+     * @param tTnNew 新员工培训
+     * @return 结果
+     */
+    @Override
+    public int insertTTnNew(TTnNew tTnNew)
+    {
+        return tTnNewMapper.insertTTnNew(tTnNew);
+    }
+
+    /**
+     * 修改新员工培训
+     *
+     * @param tTnNew 新员工培训
+     * @return 结果
+     */
+    @Override
+    public int updateTTnNew(TTnNew tTnNew)
+    {
+        return tTnNewMapper.updateTTnNew(tTnNew);
+    }
+
+    /**
+     * 批量删除新员工培训
+     *
+     * @param newIds 需要删除的新员工培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTnNewByIds(Long[] newIds)
+    {
+        return tTnNewMapper.deleteTTnNewByIds(newIds);
+    }
+
+    /**
+     * 删除新员工培训信息
+     *
+     * @param newId 新员工培训ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTnNewById(Long newId)
+    {
+        return tTnNewMapper.deleteTTnNewById(newId);
+    }
+}

master/src/main/resources/application.yml

@@ -193,7 +193,7 @@ gen:
   # 作者
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.project.production # 自动去除表前缀，默认是true
+  packageName: com.ruoyi.project.training.newstaff # 自动去除表前缀，默认是true
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
   tablePrefix: sys_

master/src/main/resources/mybatis/training/newstaff/TTnFirstplanTmplMapper.xml

@@ -0,0 +1,141 @@
+<?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.newstaff.mapper.TTnFirstplanTmplMapper">
+
+    <resultMap type="TTnFirstplanTmpl" id="TTnFirstplanTmplResult">
+        <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="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTTnFirstplanTmplVo">
+        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 ,s.dept_name from t_tn_firstplan_tmpl d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTTnFirstplanTmplList" parameterType="TTnFirstplanTmpl" resultMap="TTnFirstplanTmplResult">
+        <include refid="selectTTnFirstplanTmplVo"/>
+        <where>
+            <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="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="selectTTnFirstplanTmplById" parameterType="Long" resultMap="TTnFirstplanTmplResult">
+        <include refid="selectTTnFirstplanTmplVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTTnFirstplanTmpl" parameterType="TTnFirstplanTmpl">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_tn_firstplan_tmpl.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_tn_firstplan_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="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>
+         </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>
+         </trim>
+    </insert>
+
+    <update id="updateTTnFirstplanTmpl" parameterType="TTnFirstplanTmpl">
+        update t_tn_firstplan_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="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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTTnFirstplanTmplById" parameterType="Long">
+        update t_tn_firstplan_tmpl set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTTnFirstplanTmplByIds" parameterType="String">
+        update t_tn_firstplan_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/newstaff/TTnNewMapper.xml

@@ -0,0 +1,131 @@
+<?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.newstaff.mapper.TTnNewMapper">
+
+    <resultMap type="TTnNew" id="TTnNewResult">
+        <result property="newId"    column="new_id"    />
+        <result property="staffId"    column="staff_id"    />
+        <result property="name"    column="name"    />
+        <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="planStatus"    column="plan_status"    />
+        <result property="planYear"    column="plan_year"    />
+        <result property="startdate"    column="startdate"    />
+        <result property="enddate"    column="enddate"    />
+        <result property="mentorStaffId"    column="mentor_staff_id"    />
+        <result property="planType"    column="plan_type"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+        <result property="staffName"    column="staffName"    />
+        <result property="mentorStaffName"    column="mentorStaffName"    />
+    </resultMap>
+
+    <sql id="selectTTnNewVo">
+        select d.new_id, d.staff_id,u.nick_name as staffName,u2.nick_name as mentorStaffName, d.name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.plan_status, d.plan_year, d.startdate, d.enddate, d.mentor_staff_id, d.plan_type, d.remarks ,s.dept_name from t_tn_new d
+      left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on d.staff_id = u.staffid and u.del_flag = 0
+      left join sys_user u2 on d.mentor_staff_id = u2.staffid and u2.del_flag = 0
+    </sql>
+
+    <select id="selectTTnNewList" parameterType="TTnNew" resultMap="TTnNewResult">
+        <include refid="selectTTnNewVo"/>
+        <where>
+            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            <if test="startdate != null "> and startdate = #{startdate}</if>
+            <if test="enddate != null "> and enddate = #{enddate}</if>
+            <if test="planType != null "> and plan_type = #{planType}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectTTnNewById" parameterType="Long" resultMap="TTnNewResult">
+        <include refid="selectTTnNewVo"/>
+        where new_id = #{newId}
+    </select>
+
+    <insert id="insertTTnNew" parameterType="TTnNew">
+        <selectKey keyProperty="newId" resultType="long" order="BEFORE">
+            SELECT seq_t_tn_new.NEXTVAL as newId FROM DUAL
+        </selectKey>
+        insert into t_tn_new
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="newId != null">new_id,</if>
+            <if test="staffId != null">staff_id,</if>
+            <if test="name != null">name,</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="planStatus != null">plan_status,</if>
+            <if test="planYear != null">plan_year,</if>
+            <if test="startdate != null">startdate,</if>
+            <if test="enddate != null">enddate,</if>
+            <if test="mentorStaffId != null">mentor_staff_id,</if>
+            <if test="planType != null">plan_type,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="newId != null">#{newId},</if>
+            <if test="staffId != null">#{staffId},</if>
+            <if test="name != null">#{name},</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="planStatus != null">#{planStatus},</if>
+            <if test="planYear != null">#{planYear},</if>
+            <if test="startdate != null">#{startdate},</if>
+            <if test="enddate != null">#{enddate},</if>
+            <if test="mentorStaffId != null">#{mentorStaffId},</if>
+            <if test="planType != null">#{planType},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTnNew" parameterType="TTnNew">
+        update t_tn_new
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="staffId != null">staff_id = #{staffId},</if>
+            <if test="name != null">name = #{name},</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="planStatus != null">plan_status = #{planStatus},</if>
+            <if test="planYear != null">plan_year = #{planYear},</if>
+            <if test="startdate != null">startdate = #{startdate},</if>
+            <if test="enddate != null">enddate = #{enddate},</if>
+            <if test="mentorStaffId != null">mentor_staff_id = #{mentorStaffId},</if>
+            <if test="planType != null">plan_type = #{planType},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where new_id = #{newId}
+    </update>
+
+    <update id="deleteTTnNewById" parameterType="Long">
+        update t_tn_new set del_flag = 2 where new_id = #{newId}
+    </update>
+
+    <update id="deleteTTnNewByIds" parameterType="String">
+        update t_tn_new set del_flag = 2 where new_id in
+        <foreach item="newId" collection="array" open="(" separator="," close=")">
+            #{newId}
+        </foreach>
+    </update>
+
+</mapper>

ui/src/api/training/newstaff/firstplantmpl.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询进组培训模版列表
+export function listFirstplantmpl(query) {
+  return request({
+    url: '/newstaff/firstplantmpl/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询进组培训模版详细
+export function getFirstplantmpl(id) {
+  return request({
+    url: '/newstaff/firstplantmpl/' + id,
+    method: 'get'
+  })
+}
+
+// 新增进组培训模版
+export function addFirstplantmpl(data) {
+  return request({
+    url: '/newstaff/firstplantmpl',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改进组培训模版
+export function updateFirstplantmpl(data) {
+  return request({
+    url: '/newstaff/firstplantmpl',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除进组培训模版
+export function delFirstplantmpl(id) {
+  return request({
+    url: '/newstaff/firstplantmpl/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出进组培训模版
+export function exportFirstplantmpl(query) {
+  return request({
+    url: '/newstaff/firstplantmpl/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/training/newstaff/tnNew.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询新员工培训列表
+export function listTnNew(query) {
+  return request({
+    url: '/newstaff/tnNew/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询新员工培训详细
+export function getTnNew(newId) {
+  return request({
+    url: '/newstaff/tnNew/' + newId,
+    method: 'get'
+  })
+}
+
+// 新增新员工培训
+export function addTnNew(data) {
+  return request({
+    url: '/newstaff/tnNew',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改新员工培训
+export function updateTnNew(data) {
+  return request({
+    url: '/newstaff/tnNew',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除新员工培训
+export function delTnNew(newId) {
+  return request({
+    url: '/newstaff/tnNew/' + newId,
+    method: 'delete'
+  })
+}
+
+// 导出新员工培训
+export function exportTnNew(query) {
+  return request({
+    url: '/newstaff/tnNew/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/training/newstaff/firstplantmpl/index.vue

@@ -0,0 +1,448 @@
+<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="topic">
+        <el-input
+          v-model="queryParams.topic"
+          placeholder="请输入培训主题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="培训类型" prop="courseType">
+        <el-input
+          v-model="queryParams.courseType"
+          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="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="['newstaff:firstplantmpl: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="['newstaff:firstplantmpl: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="['newstaff:firstplantmpl:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['newstaff:firstplantmpl:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="firstplantmplList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <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="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="['newstaff:firstplantmpl:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['newstaff:firstplantmpl: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="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="培训内容">
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
+        </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-input v-model="form.courseType" 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="assess">
+          <el-input v-model="form.assess" 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 { listFirstplantmpl, getFirstplantmpl, delFirstplantmpl, addFirstplantmpl, updateFirstplantmpl, exportFirstplantmpl, importTemplate} from "@/api/training/newstaff/firstplantmpl";
+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: "Firstplantmpl",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 进组培训模版表格数据
+      firstplantmplList: [],
+      // 弹出层标题
+      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 + "/newstaff/firstplantmpl/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        courseType: null,
+        trainer: null,
+        courseDate: null,
+        assess: 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;
+      listFirstplantmpl(this.queryParams).then(response => {
+        this.firstplantmplList = 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
+      };
+      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
+      getFirstplantmpl(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) {
+            updateFirstplantmpl(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFirstplantmpl(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 delFirstplantmpl(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有进组培训模版数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportFirstplantmpl(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/newstaff/index.vue

@@ -0,0 +1,3 @@
+<template >
+  <router-view />
+</template>

ui/src/views/training/newstaff/tnNew/index.vue

@@ -0,0 +1,490 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="年度培训标题" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          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
+            v-for="dict in planStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.startdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="enddate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.enddate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="培训类型 " prop="planType">
+        <el-select v-model="queryParams.planType" placeholder="请选择培训类型" clearable size="small">
+          <el-option
+            v-for="dict in planTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </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="['newstaff:tnNew: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="['newstaff:tnNew: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="['newstaff:tnNew:remove']"
+        >删除</el-button>
+      </el-col>
+<!--        <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--                    type="info"-->
+<!--                    icon="el-icon-upload2"-->
+<!--                    size="mini"-->
+<!--                    @click="handleImport"-->
+<!--                    v-hasPermi="['newstaff:tnNew:edit']"-->
+<!--            >导入</el-button>-->
+<!--        </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['newstaff:tnNew:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tnNewList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="培训员工编号" align="center" prop="staffId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="新员工姓名" align="center" fixed="left" prop="staffName" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训状态" align="center" prop="planStatus" :formatter="planStatusFormat" />
+      <el-table-column label="开始时间" align="center" prop="startdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="enddate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="导师员工编号" align="center" prop="mentorStaffId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="导师号" align="center" prop="mentorStaffName" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训类型 1-新员工 2-转岗" align="center" prop="planType" :formatter="planTypeFormat" />
+      <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="['newstaff:tnNew:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['newstaff:tnNew: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="staffId">
+          <el-input v-model="form.staffId" placeholder="请输入培训员工编号" />
+        </el-form-item>
+        <el-form-item label="培训状态">
+          <el-select v-model="form.planStatus" placeholder="请选择培训状态">
+            <el-option
+              v-for="dict in planStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.startdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="enddate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.enddate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="导师员工编号" prop="mentorStaffId">
+          <el-input v-model="form.mentorStaffId" placeholder="请输入导师员工编号" />
+        </el-form-item>
+        <el-form-item label="培训类型 1-新员工 2-转岗" prop="planType">
+          <el-radio-group v-model="form.planType">
+            <el-radio
+              v-for="dict in planTypeOptions"
+              :key="dict.dictValue"
+              :label="parseInt(dict.dictValue)"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </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 { listTnNew, getTnNew, delTnNew, addTnNew, updateTnNew, exportTnNew, importTemplate} from "@/api/training/newstaff/tnNew";
+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";
+
+export default {
+  name: "TnNew",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 新员工培训表格数据
+      tnNewList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 培训状态字典
+      planStatusOptions: [],
+      // 培训类型 1-新员工 2-转岗字典
+      planTypeOptions: [],
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/newstaff/tnNew/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        name: null,
+        planStatus: null,
+        startdate: null,
+        enddate: null,
+        planType: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("training_newstaff_status").then(response => {
+      this.planStatusOptions = response.data;
+    });
+    this.getDicts("training_newstaff_type").then(response => {
+      this.planTypeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询新员工培训列表 */
+    getList() {
+      this.loading = true;
+      listTnNew(this.queryParams).then(response => {
+        this.tnNewList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 培训状态字典翻译
+    planStatusFormat(row, column) {
+      return this.selectDictLabel(this.planStatusOptions, row.planStatus);
+    },
+    // 培训类型 1-新员工 2-转岗字典翻译
+    planTypeFormat(row, column) {
+      return this.selectDictLabel(this.planTypeOptions, row.planType);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        newId: null,
+        staffId: null,
+        name: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        planStatus: 0,
+        planYear: null,
+        startdate: null,
+        enddate: null,
+        mentorStaffId: null,
+        planType: 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.newId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加新员工培训";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const newId = row.newId || this.ids
+      getTnNew(newId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改新员工培训";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.newId != null) {
+            updateTnNew(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTnNew(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const newIds = row.newId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delTnNew(newIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有新员工培训数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportTnNew(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>