王子文 班组管理 - 人员考核管理

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftAnnualAssHisController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.project.shiftmgr.controller;
+
+import java.util.Date;
+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.shiftmgr.domain.TShiftAnnualAssHis;
+import com.ruoyi.project.shiftmgr.service.ITShiftAnnualAssHisService;
+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 2022-08-05
+ */
+@RestController
+@RequestMapping("/shiftmgr/his")
+public class TShiftAnnualAssHisController extends BaseController
+{
+    @Autowired
+    private ITShiftAnnualAssHisService tShiftAnnualAssHisService;
+
+    /**
+     * 查询年度考核打分记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:his:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        startPage();
+        List<TShiftAnnualAssHis> list = tShiftAnnualAssHisService.selectTShiftAnnualAssHisList(tShiftAnnualAssHis);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出年度考核打分记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:his:export')")
+    @Log(title = "年度考核打分记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        List<TShiftAnnualAssHis> list = tShiftAnnualAssHisService.selectTShiftAnnualAssHisList(tShiftAnnualAssHis);
+        ExcelUtil<TShiftAnnualAssHis> util = new ExcelUtil<TShiftAnnualAssHis>(TShiftAnnualAssHis.class);
+        return util.exportExcel(list, "his");
+    }
+
+    /**
+     * 获取年度考核打分记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:his:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tShiftAnnualAssHisService.selectTShiftAnnualAssHisById(id));
+    }
+
+    /**
+     * 新增年度考核打分记录
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:his:add')")
+    @Log(title = "年度考核打分记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        tShiftAnnualAssHis.setCreaterCode(getUserId());
+        tShiftAnnualAssHis.setCreatedate(new Date());
+        return toAjax(tShiftAnnualAssHisService.insertTShiftAnnualAssHis(tShiftAnnualAssHis));
+    }
+
+    /**
+     * 修改年度考核打分记录
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:his:edit')")
+    @Log(title = "年度考核打分记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        tShiftAnnualAssHis.setUpdaterCode(getUserId());
+        tShiftAnnualAssHis.setUpdatedate(new Date());
+        return toAjax(tShiftAnnualAssHisService.updateTShiftAnnualAssHis(tShiftAnnualAssHis));
+    }
+
+    /**
+     * 删除年度考核打分记录
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:his:remove')")
+    @Log(title = "年度考核打分记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tShiftAnnualAssHisService.deleteTShiftAnnualAssHisByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftAnnualAssPointsController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.project.shiftmgr.controller;
+
+import java.util.Date;
+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.shiftmgr.domain.TShiftAnnualAssPoints;
+import com.ruoyi.project.shiftmgr.service.ITShiftAnnualAssPointsService;
+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 2022-08-05
+ */
+@RestController
+@RequestMapping("/shiftmgr/points")
+public class TShiftAnnualAssPointsController extends BaseController
+{
+    @Autowired
+    private ITShiftAnnualAssPointsService tShiftAnnualAssPointsService;
+
+    /**
+     * 查询年度考核计分列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:points:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        startPage();
+        List<TShiftAnnualAssPoints> list = tShiftAnnualAssPointsService.selectTShiftAnnualAssPointsList(tShiftAnnualAssPoints);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出年度考核计分列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:points:export')")
+    @Log(title = "年度考核计分", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        List<TShiftAnnualAssPoints> list = tShiftAnnualAssPointsService.selectTShiftAnnualAssPointsList(tShiftAnnualAssPoints);
+        ExcelUtil<TShiftAnnualAssPoints> util = new ExcelUtil<TShiftAnnualAssPoints>(TShiftAnnualAssPoints.class);
+        return util.exportExcel(list, "points");
+    }
+
+    /**
+     * 获取年度考核计分详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:points:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tShiftAnnualAssPointsService.selectTShiftAnnualAssPointsById(id));
+    }
+
+    /**
+     * 新增年度考核计分
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:points:add')")
+    @Log(title = "年度考核计分", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        tShiftAnnualAssPoints.setCreaterCode(getUserId());
+        tShiftAnnualAssPoints.setCreatedate(new Date());
+        return toAjax(tShiftAnnualAssPointsService.insertTShiftAnnualAssPoints(tShiftAnnualAssPoints));
+    }
+
+    /**
+     * 修改年度考核计分
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:points:edit')")
+    @Log(title = "年度考核计分", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        tShiftAnnualAssPoints.setUpdaterCode(getUserId());
+        tShiftAnnualAssPoints.setUpdatedate(new Date());
+        return toAjax(tShiftAnnualAssPointsService.updateTShiftAnnualAssPoints(tShiftAnnualAssPoints));
+    }
+
+    /**
+     * 删除年度考核计分
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:points:remove')")
+    @Log(title = "年度考核计分", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tShiftAnnualAssPointsService.deleteTShiftAnnualAssPointsByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftAnnualAssessmentController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.project.shiftmgr.controller;
+
+import java.util.Date;
+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.shiftmgr.domain.TShiftAnnualAssessment;
+import com.ruoyi.project.shiftmgr.service.ITShiftAnnualAssessmentService;
+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 2022-08-05
+ */
+@RestController
+@RequestMapping("/shiftmgr/assessment")
+public class TShiftAnnualAssessmentController extends BaseController
+{
+    @Autowired
+    private ITShiftAnnualAssessmentService tShiftAnnualAssessmentService;
+
+    /**
+     * 查询年度考核信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:assessment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        startPage();
+        List<TShiftAnnualAssessment> list = tShiftAnnualAssessmentService.selectTShiftAnnualAssessmentList(tShiftAnnualAssessment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出年度考核信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:assessment:export')")
+    @Log(title = "年度考核信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        List<TShiftAnnualAssessment> list = tShiftAnnualAssessmentService.selectTShiftAnnualAssessmentList(tShiftAnnualAssessment);
+        ExcelUtil<TShiftAnnualAssessment> util = new ExcelUtil<TShiftAnnualAssessment>(TShiftAnnualAssessment.class);
+        return util.exportExcel(list, "assessment");
+    }
+
+    /**
+     * 获取年度考核信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:assessment:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tShiftAnnualAssessmentService.selectTShiftAnnualAssessmentById(id));
+    }
+
+    /**
+     * 新增年度考核信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:assessment:add')")
+    @Log(title = "年度考核信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        tShiftAnnualAssessment.setCreaterCode(getUserId());
+        tShiftAnnualAssessment.setCreatedate(new Date());
+        return toAjax(tShiftAnnualAssessmentService.insertTShiftAnnualAssessment(tShiftAnnualAssessment));
+    }
+
+    /**
+     * 修改年度考核信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:assessment:edit')")
+    @Log(title = "年度考核信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        tShiftAnnualAssessment.setUpdaterCode(getUserId());
+        tShiftAnnualAssessment.setUpdatedate(new Date());
+        return toAjax(tShiftAnnualAssessmentService.updateTShiftAnnualAssessment(tShiftAnnualAssessment));
+    }
+
+    /**
+     * 删除年度考核信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:assessment:remove')")
+    @Log(title = "年度考核信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tShiftAnnualAssessmentService.deleteTShiftAnnualAssessmentByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/domain/TShiftAnnualAssHis.java

@@ -0,0 +1,166 @@
+package com.ruoyi.project.shiftmgr.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_shift_annual_ass_his
+ *
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public class TShiftAnnualAssHis extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 考核信息ID，关联年度考核信息表主键ID */
+    @Excel(name = "考核信息ID，关联年度考核信息表主键ID")
+    private Long assId;
+
+    /** 打分人，关联T_STAFFMGR表主键ID */
+    @Excel(name = "打分人，关联T_STAFFMGR表主键ID")
+    private String assessor;
+
+    /** 分数 */
+    @Excel(name = "分数")
+    private Long socre;
+
+    /** 状态，0：正常；2：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long 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;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setAssId(Long assId)
+    {
+        this.assId = assId;
+    }
+
+    public Long getAssId()
+    {
+        return assId;
+    }
+    public void setAssessor(String assessor)
+    {
+        this.assessor = assessor;
+    }
+
+    public String getAssessor()
+    {
+        return assessor;
+    }
+    public void setSocre(Long socre)
+    {
+        this.socre = socre;
+    }
+
+    public Long getSocre()
+    {
+        return socre;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("assId", getAssId())
+            .append("assessor", getAssessor())
+            .append("socre", getSocre())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/domain/TShiftAnnualAssPoints.java

@@ -0,0 +1,166 @@
+package com.ruoyi.project.shiftmgr.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_shift_annual_ass_points
+ *
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public class TShiftAnnualAssPoints extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 考核人，关联T_STAFFMGR表主键ID */
+    @Excel(name = "考核人，关联T_STAFFMGR表主键ID")
+    private String assessor;
+
+    /** 剩余分数，年末清零 */
+    @Excel(name = "剩余分数，年末清零")
+    private String pointsLeft;
+
+    /** 考核年度 */
+    @Excel(name = "考核年度")
+    private String assYear;
+
+    /** 状态，0：正常；2：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long 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;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setAssessor(String assessor)
+    {
+        this.assessor = assessor;
+    }
+
+    public String getAssessor()
+    {
+        return assessor;
+    }
+    public void setPointsLeft(String pointsLeft)
+    {
+        this.pointsLeft = pointsLeft;
+    }
+
+    public String getPointsLeft()
+    {
+        return pointsLeft;
+    }
+    public void setAssYear(String assYear)
+    {
+        this.assYear = assYear;
+    }
+
+    public String getAssYear()
+    {
+        return assYear;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("assessor", getAssessor())
+            .append("pointsLeft", getPointsLeft())
+            .append("assYear", getAssYear())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/domain/TShiftAnnualAssessment.java

@@ -0,0 +1,250 @@
+package com.ruoyi.project.shiftmgr.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_shift_annual_assessment
+ *
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public class TShiftAnnualAssessment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 员工ID，关联T_STAFFMGR表主键ID */
+    @Excel(name = "员工ID，关联T_STAFFMGR表主键ID")
+    private String staffId;
+
+    /** 班组 */
+    @Excel(name = "班组")
+    private String team;
+
+    /** 班长ID，关联T_STAFFMGR表主键ID */
+    @Excel(name = "班长ID，关联T_STAFFMGR表主键ID")
+    private String leaderId;
+
+    /** 考核年度 */
+    @Excel(name = "考核年度")
+    private String assYear;
+
+    /** 班长打分，根据年度考核打分记录汇总 */
+    @Excel(name = "班长打分，根据年度考核打分记录汇总")
+    private Long leaderScore;
+
+    /** 工长打分，根据年度考核打分记录汇总 */
+    @Excel(name = "工长打分，根据年度考核打分记录汇总")
+    private Long foremanScore;
+
+    /** 主管打分，根据年度考核打分记录汇总 */
+    @Excel(name = "主管打分，根据年度考核打分记录汇总")
+    private Long directorScore;
+
+    /** 工程师打分，根据年度考核打分记录汇总 */
+    @Excel(name = "工程师打分，根据年度考核打分记录汇总")
+    private Long engineerScore;
+
+    /** 经理打分，根据年度考核打分记录汇总 */
+    @Excel(name = "经理打分，根据年度考核打分记录汇总")
+    private Long managerSocre;
+
+    /** 状态，0：正常；2：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long 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;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setStaffId(String staffId)
+    {
+        this.staffId = staffId;
+    }
+
+    public String getStaffId()
+    {
+        return staffId;
+    }
+    public void setTeam(String team)
+    {
+        this.team = team;
+    }
+
+    public String getTeam()
+    {
+        return team;
+    }
+    public void setLeaderId(String leaderId)
+    {
+        this.leaderId = leaderId;
+    }
+
+    public String getLeaderId()
+    {
+        return leaderId;
+    }
+    public void setAssYear(String assYear)
+    {
+        this.assYear = assYear;
+    }
+
+    public String getAssYear()
+    {
+        return assYear;
+    }
+    public void setLeaderScore(Long leaderScore)
+    {
+        this.leaderScore = leaderScore;
+    }
+
+    public Long getLeaderScore()
+    {
+        return leaderScore;
+    }
+    public void setForemanScore(Long foremanScore)
+    {
+        this.foremanScore = foremanScore;
+    }
+
+    public Long getForemanScore()
+    {
+        return foremanScore;
+    }
+    public void setDirectorScore(Long directorScore)
+    {
+        this.directorScore = directorScore;
+    }
+
+    public Long getDirectorScore()
+    {
+        return directorScore;
+    }
+    public void setEngineerScore(Long engineerScore)
+    {
+        this.engineerScore = engineerScore;
+    }
+
+    public Long getEngineerScore()
+    {
+        return engineerScore;
+    }
+    public void setManagerSocre(Long managerSocre)
+    {
+        this.managerSocre = managerSocre;
+    }
+
+    public Long getManagerSocre()
+    {
+        return managerSocre;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("staffId", getStaffId())
+            .append("team", getTeam())
+            .append("leaderId", getLeaderId())
+            .append("assYear", getAssYear())
+            .append("leaderScore", getLeaderScore())
+            .append("foremanScore", getForemanScore())
+            .append("directorScore", getDirectorScore())
+            .append("engineerScore", getEngineerScore())
+            .append("managerSocre", getManagerSocre())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/mapper/TShiftAnnualAssHisMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.shiftmgr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssHis;
+
+/**
+ * 年度考核打分记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public interface TShiftAnnualAssHisMapper 
+{
+    /**
+     * 查询年度考核打分记录
+     * 
+     * @param id 年度考核打分记录ID
+     * @return 年度考核打分记录
+     */
+    public TShiftAnnualAssHis selectTShiftAnnualAssHisById(Long id);
+
+    /**
+     * 查询年度考核打分记录列表
+     * 
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 年度考核打分记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TShiftAnnualAssHis> selectTShiftAnnualAssHisList(TShiftAnnualAssHis tShiftAnnualAssHis);
+
+    /**
+     * 新增年度考核打分记录
+     * 
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 结果
+     */
+    public int insertTShiftAnnualAssHis(TShiftAnnualAssHis tShiftAnnualAssHis);
+
+    /**
+     * 修改年度考核打分记录
+     * 
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 结果
+     */
+    public int updateTShiftAnnualAssHis(TShiftAnnualAssHis tShiftAnnualAssHis);
+
+    /**
+     * 删除年度考核打分记录
+     * 
+     * @param id 年度考核打分记录ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssHisById(Long id);
+
+    /**
+     * 批量删除年度考核打分记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssHisByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/mapper/TShiftAnnualAssPointsMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.shiftmgr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssPoints;
+
+/**
+ * 年度考核计分Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public interface TShiftAnnualAssPointsMapper 
+{
+    /**
+     * 查询年度考核计分
+     * 
+     * @param id 年度考核计分ID
+     * @return 年度考核计分
+     */
+    public TShiftAnnualAssPoints selectTShiftAnnualAssPointsById(Long id);
+
+    /**
+     * 查询年度考核计分列表
+     * 
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 年度考核计分集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TShiftAnnualAssPoints> selectTShiftAnnualAssPointsList(TShiftAnnualAssPoints tShiftAnnualAssPoints);
+
+    /**
+     * 新增年度考核计分
+     * 
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 结果
+     */
+    public int insertTShiftAnnualAssPoints(TShiftAnnualAssPoints tShiftAnnualAssPoints);
+
+    /**
+     * 修改年度考核计分
+     * 
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 结果
+     */
+    public int updateTShiftAnnualAssPoints(TShiftAnnualAssPoints tShiftAnnualAssPoints);
+
+    /**
+     * 删除年度考核计分
+     * 
+     * @param id 年度考核计分ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssPointsById(Long id);
+
+    /**
+     * 批量删除年度考核计分
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssPointsByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/mapper/TShiftAnnualAssessmentMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.shiftmgr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssessment;
+
+/**
+ * 年度考核信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public interface TShiftAnnualAssessmentMapper 
+{
+    /**
+     * 查询年度考核信息
+     * 
+     * @param id 年度考核信息ID
+     * @return 年度考核信息
+     */
+    public TShiftAnnualAssessment selectTShiftAnnualAssessmentById(Long id);
+
+    /**
+     * 查询年度考核信息列表
+     * 
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 年度考核信息集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TShiftAnnualAssessment> selectTShiftAnnualAssessmentList(TShiftAnnualAssessment tShiftAnnualAssessment);
+
+    /**
+     * 新增年度考核信息
+     * 
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 结果
+     */
+    public int insertTShiftAnnualAssessment(TShiftAnnualAssessment tShiftAnnualAssessment);
+
+    /**
+     * 修改年度考核信息
+     * 
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 结果
+     */
+    public int updateTShiftAnnualAssessment(TShiftAnnualAssessment tShiftAnnualAssessment);
+
+    /**
+     * 删除年度考核信息
+     * 
+     * @param id 年度考核信息ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssessmentById(Long id);
+
+    /**
+     * 批量删除年度考核信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssessmentByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/ITShiftAnnualAssHisService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.shiftmgr.service;
+
+import java.util.List;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssHis;
+
+/**
+ * 年度考核打分记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public interface ITShiftAnnualAssHisService 
+{
+    /**
+     * 查询年度考核打分记录
+     * 
+     * @param id 年度考核打分记录ID
+     * @return 年度考核打分记录
+     */
+    public TShiftAnnualAssHis selectTShiftAnnualAssHisById(Long id);
+
+    /**
+     * 查询年度考核打分记录列表
+     * 
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 年度考核打分记录集合
+     */
+    public List<TShiftAnnualAssHis> selectTShiftAnnualAssHisList(TShiftAnnualAssHis tShiftAnnualAssHis);
+
+    /**
+     * 新增年度考核打分记录
+     * 
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 结果
+     */
+    public int insertTShiftAnnualAssHis(TShiftAnnualAssHis tShiftAnnualAssHis);
+
+    /**
+     * 修改年度考核打分记录
+     * 
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 结果
+     */
+    public int updateTShiftAnnualAssHis(TShiftAnnualAssHis tShiftAnnualAssHis);
+
+    /**
+     * 批量删除年度考核打分记录
+     * 
+     * @param ids 需要删除的年度考核打分记录ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssHisByIds(Long[] ids);
+
+    /**
+     * 删除年度考核打分记录信息
+     * 
+     * @param id 年度考核打分记录ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssHisById(Long id);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/ITShiftAnnualAssPointsService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.shiftmgr.service;
+
+import java.util.List;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssPoints;
+
+/**
+ * 年度考核计分Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public interface ITShiftAnnualAssPointsService 
+{
+    /**
+     * 查询年度考核计分
+     * 
+     * @param id 年度考核计分ID
+     * @return 年度考核计分
+     */
+    public TShiftAnnualAssPoints selectTShiftAnnualAssPointsById(Long id);
+
+    /**
+     * 查询年度考核计分列表
+     * 
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 年度考核计分集合
+     */
+    public List<TShiftAnnualAssPoints> selectTShiftAnnualAssPointsList(TShiftAnnualAssPoints tShiftAnnualAssPoints);
+
+    /**
+     * 新增年度考核计分
+     * 
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 结果
+     */
+    public int insertTShiftAnnualAssPoints(TShiftAnnualAssPoints tShiftAnnualAssPoints);
+
+    /**
+     * 修改年度考核计分
+     * 
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 结果
+     */
+    public int updateTShiftAnnualAssPoints(TShiftAnnualAssPoints tShiftAnnualAssPoints);
+
+    /**
+     * 批量删除年度考核计分
+     * 
+     * @param ids 需要删除的年度考核计分ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssPointsByIds(Long[] ids);
+
+    /**
+     * 删除年度考核计分信息
+     * 
+     * @param id 年度考核计分ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssPointsById(Long id);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/ITShiftAnnualAssessmentService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.shiftmgr.service;
+
+import java.util.List;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssessment;
+
+/**
+ * 年度考核信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+public interface ITShiftAnnualAssessmentService 
+{
+    /**
+     * 查询年度考核信息
+     * 
+     * @param id 年度考核信息ID
+     * @return 年度考核信息
+     */
+    public TShiftAnnualAssessment selectTShiftAnnualAssessmentById(Long id);
+
+    /**
+     * 查询年度考核信息列表
+     * 
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 年度考核信息集合
+     */
+    public List<TShiftAnnualAssessment> selectTShiftAnnualAssessmentList(TShiftAnnualAssessment tShiftAnnualAssessment);
+
+    /**
+     * 新增年度考核信息
+     * 
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 结果
+     */
+    public int insertTShiftAnnualAssessment(TShiftAnnualAssessment tShiftAnnualAssessment);
+
+    /**
+     * 修改年度考核信息
+     * 
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 结果
+     */
+    public int updateTShiftAnnualAssessment(TShiftAnnualAssessment tShiftAnnualAssessment);
+
+    /**
+     * 批量删除年度考核信息
+     * 
+     * @param ids 需要删除的年度考核信息ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssessmentByIds(Long[] ids);
+
+    /**
+     * 删除年度考核信息信息
+     * 
+     * @param id 年度考核信息ID
+     * @return 结果
+     */
+    public int deleteTShiftAnnualAssessmentById(Long id);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/impl/TShiftAnnualAssHisServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.shiftmgr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.shiftmgr.mapper.TShiftAnnualAssHisMapper;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssHis;
+import com.ruoyi.project.shiftmgr.service.ITShiftAnnualAssHisService;
+
+/**
+ * 年度考核打分记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+@Service
+public class TShiftAnnualAssHisServiceImpl implements ITShiftAnnualAssHisService
+{
+    @Autowired
+    private TShiftAnnualAssHisMapper tShiftAnnualAssHisMapper;
+
+    /**
+     * 查询年度考核打分记录
+     *
+     * @param id 年度考核打分记录ID
+     * @return 年度考核打分记录
+     */
+    @Override
+    public TShiftAnnualAssHis selectTShiftAnnualAssHisById(Long id)
+    {
+        return tShiftAnnualAssHisMapper.selectTShiftAnnualAssHisById(id);
+    }
+
+    /**
+     * 查询年度考核打分记录列表
+     *
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 年度考核打分记录
+     */
+    @Override
+    public List<TShiftAnnualAssHis> selectTShiftAnnualAssHisList(TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        return tShiftAnnualAssHisMapper.selectTShiftAnnualAssHisList(tShiftAnnualAssHis);
+    }
+
+    /**
+     * 新增年度考核打分记录
+     *
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 结果
+     */
+    @Override
+    public int insertTShiftAnnualAssHis(TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        return tShiftAnnualAssHisMapper.insertTShiftAnnualAssHis(tShiftAnnualAssHis);
+    }
+
+    /**
+     * 修改年度考核打分记录
+     *
+     * @param tShiftAnnualAssHis 年度考核打分记录
+     * @return 结果
+     */
+    @Override
+    public int updateTShiftAnnualAssHis(TShiftAnnualAssHis tShiftAnnualAssHis)
+    {
+        return tShiftAnnualAssHisMapper.updateTShiftAnnualAssHis(tShiftAnnualAssHis);
+    }
+
+    /**
+     * 批量删除年度考核打分记录
+     *
+     * @param ids 需要删除的年度考核打分记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftAnnualAssHisByIds(Long[] ids)
+    {
+        return tShiftAnnualAssHisMapper.deleteTShiftAnnualAssHisByIds(ids);
+    }
+
+    /**
+     * 删除年度考核打分记录信息
+     *
+     * @param id 年度考核打分记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftAnnualAssHisById(Long id)
+    {
+        return tShiftAnnualAssHisMapper.deleteTShiftAnnualAssHisById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/impl/TShiftAnnualAssPointsServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.shiftmgr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.shiftmgr.mapper.TShiftAnnualAssPointsMapper;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssPoints;
+import com.ruoyi.project.shiftmgr.service.ITShiftAnnualAssPointsService;
+
+/**
+ * 年度考核计分Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+@Service
+public class TShiftAnnualAssPointsServiceImpl implements ITShiftAnnualAssPointsService
+{
+    @Autowired
+    private TShiftAnnualAssPointsMapper tShiftAnnualAssPointsMapper;
+
+    /**
+     * 查询年度考核计分
+     *
+     * @param id 年度考核计分ID
+     * @return 年度考核计分
+     */
+    @Override
+    public TShiftAnnualAssPoints selectTShiftAnnualAssPointsById(Long id)
+    {
+        return tShiftAnnualAssPointsMapper.selectTShiftAnnualAssPointsById(id);
+    }
+
+    /**
+     * 查询年度考核计分列表
+     *
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 年度考核计分
+     */
+    @Override
+    public List<TShiftAnnualAssPoints> selectTShiftAnnualAssPointsList(TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        return tShiftAnnualAssPointsMapper.selectTShiftAnnualAssPointsList(tShiftAnnualAssPoints);
+    }
+
+    /**
+     * 新增年度考核计分
+     *
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 结果
+     */
+    @Override
+    public int insertTShiftAnnualAssPoints(TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        return tShiftAnnualAssPointsMapper.insertTShiftAnnualAssPoints(tShiftAnnualAssPoints);
+    }
+
+    /**
+     * 修改年度考核计分
+     *
+     * @param tShiftAnnualAssPoints 年度考核计分
+     * @return 结果
+     */
+    @Override
+    public int updateTShiftAnnualAssPoints(TShiftAnnualAssPoints tShiftAnnualAssPoints)
+    {
+        return tShiftAnnualAssPointsMapper.updateTShiftAnnualAssPoints(tShiftAnnualAssPoints);
+    }
+
+    /**
+     * 批量删除年度考核计分
+     *
+     * @param ids 需要删除的年度考核计分ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftAnnualAssPointsByIds(Long[] ids)
+    {
+        return tShiftAnnualAssPointsMapper.deleteTShiftAnnualAssPointsByIds(ids);
+    }
+
+    /**
+     * 删除年度考核计分信息
+     *
+     * @param id 年度考核计分ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftAnnualAssPointsById(Long id)
+    {
+        return tShiftAnnualAssPointsMapper.deleteTShiftAnnualAssPointsById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/impl/TShiftAnnualAssessmentServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.shiftmgr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.shiftmgr.mapper.TShiftAnnualAssessmentMapper;
+import com.ruoyi.project.shiftmgr.domain.TShiftAnnualAssessment;
+import com.ruoyi.project.shiftmgr.service.ITShiftAnnualAssessmentService;
+
+/**
+ * 年度考核信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-08-05
+ */
+@Service
+public class TShiftAnnualAssessmentServiceImpl implements ITShiftAnnualAssessmentService
+{
+    @Autowired
+    private TShiftAnnualAssessmentMapper tShiftAnnualAssessmentMapper;
+
+    /**
+     * 查询年度考核信息
+     *
+     * @param id 年度考核信息ID
+     * @return 年度考核信息
+     */
+    @Override
+    public TShiftAnnualAssessment selectTShiftAnnualAssessmentById(Long id)
+    {
+        return tShiftAnnualAssessmentMapper.selectTShiftAnnualAssessmentById(id);
+    }
+
+    /**
+     * 查询年度考核信息列表
+     *
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 年度考核信息
+     */
+    @Override
+    public List<TShiftAnnualAssessment> selectTShiftAnnualAssessmentList(TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        return tShiftAnnualAssessmentMapper.selectTShiftAnnualAssessmentList(tShiftAnnualAssessment);
+    }
+
+    /**
+     * 新增年度考核信息
+     *
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 结果
+     */
+    @Override
+    public int insertTShiftAnnualAssessment(TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        return tShiftAnnualAssessmentMapper.insertTShiftAnnualAssessment(tShiftAnnualAssessment);
+    }
+
+    /**
+     * 修改年度考核信息
+     *
+     * @param tShiftAnnualAssessment 年度考核信息
+     * @return 结果
+     */
+    @Override
+    public int updateTShiftAnnualAssessment(TShiftAnnualAssessment tShiftAnnualAssessment)
+    {
+        return tShiftAnnualAssessmentMapper.updateTShiftAnnualAssessment(tShiftAnnualAssessment);
+    }
+
+    /**
+     * 批量删除年度考核信息
+     *
+     * @param ids 需要删除的年度考核信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftAnnualAssessmentByIds(Long[] ids)
+    {
+        return tShiftAnnualAssessmentMapper.deleteTShiftAnnualAssessmentByIds(ids);
+    }
+
+    /**
+     * 删除年度考核信息信息
+     *
+     * @param id 年度考核信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftAnnualAssessmentById(Long id)
+    {
+        return tShiftAnnualAssessmentMapper.deleteTShiftAnnualAssessmentById(id);
+    }
+}

master/src/main/resources/mybatis/shiftmgr/TShiftAnnualAssHisMapper.xml

@@ -0,0 +1,106 @@
+<?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.shiftmgr.mapper.TShiftAnnualAssHisMapper">
+    
+    <resultMap type="TShiftAnnualAssHis" id="TShiftAnnualAssHisResult">
+        <result property="id"    column="id"    />
+        <result property="assId"    column="ass_id"    />
+        <result property="assessor"    column="assessor"    />
+        <result property="socre"    column="socre"    />
+        <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="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTShiftAnnualAssHisVo">
+        select d.id, d.ass_id, d.assessor, d.socre, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_shift_annual_ass_his d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTShiftAnnualAssHisList" parameterType="TShiftAnnualAssHis" resultMap="TShiftAnnualAssHisResult">
+        <include refid="selectTShiftAnnualAssHisVo"/>
+        <where>  
+            <if test="assId != null "> and ass_id = #{assId}</if>
+            <if test="assessor != null  and assessor != ''"> and assessor = #{assessor}</if>
+            <if test="socre != null "> and socre = #{socre}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTShiftAnnualAssHisById" parameterType="Long" resultMap="TShiftAnnualAssHisResult">
+        <include refid="selectTShiftAnnualAssHisVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTShiftAnnualAssHis" parameterType="TShiftAnnualAssHis">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT SEQ_T_SHIFT_ANNUAL_ASS_HIS.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_shift_annual_ass_his
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="assId != null">ass_id,</if>
+            <if test="assessor != null">assessor,</if>
+            <if test="socre != null">socre,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="assId != null">#{assId},</if>
+            <if test="assessor != null">#{assessor},</if>
+            <if test="socre != null">#{socre},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTShiftAnnualAssHis" parameterType="TShiftAnnualAssHis">
+        update t_shift_annual_ass_his
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="assId != null">ass_id = #{assId},</if>
+            <if test="assessor != null">assessor = #{assessor},</if>
+            <if test="socre != null">socre = #{socre},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTShiftAnnualAssHisById" parameterType="Long">
+        update t_shift_annual_ass_his set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTShiftAnnualAssHisByIds" parameterType="String">
+        update t_shift_annual_ass_his set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/shiftmgr/TShiftAnnualAssPointsMapper.xml

@@ -0,0 +1,106 @@
+<?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.shiftmgr.mapper.TShiftAnnualAssPointsMapper">
+    
+    <resultMap type="TShiftAnnualAssPoints" id="TShiftAnnualAssPointsResult">
+        <result property="id"    column="id"    />
+        <result property="assessor"    column="assessor"    />
+        <result property="pointsLeft"    column="points_left"    />
+        <result property="assYear"    column="ass_year"    />
+        <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="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTShiftAnnualAssPointsVo">
+        select d.id, d.assessor, d.points_left, d.ass_year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_shift_annual_ass_points d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTShiftAnnualAssPointsList" parameterType="TShiftAnnualAssPoints" resultMap="TShiftAnnualAssPointsResult">
+        <include refid="selectTShiftAnnualAssPointsVo"/>
+        <where>  
+            <if test="assessor != null  and assessor != ''"> and assessor = #{assessor}</if>
+            <if test="pointsLeft != null  and pointsLeft != ''"> and points_left = #{pointsLeft}</if>
+            <if test="assYear != null  and assYear != ''"> and ass_year = #{assYear}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTShiftAnnualAssPointsById" parameterType="Long" resultMap="TShiftAnnualAssPointsResult">
+        <include refid="selectTShiftAnnualAssPointsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTShiftAnnualAssPoints" parameterType="TShiftAnnualAssPoints">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT SEQ_T_SHIFT_ANNUAL_ASS_POINTS.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_shift_annual_ass_points
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="assessor != null">assessor,</if>
+            <if test="pointsLeft != null">points_left,</if>
+            <if test="assYear != null">ass_year,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="assessor != null">#{assessor},</if>
+            <if test="pointsLeft != null">#{pointsLeft},</if>
+            <if test="assYear != null">#{assYear},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTShiftAnnualAssPoints" parameterType="TShiftAnnualAssPoints">
+        update t_shift_annual_ass_points
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="assessor != null">assessor = #{assessor},</if>
+            <if test="pointsLeft != null">points_left = #{pointsLeft},</if>
+            <if test="assYear != null">ass_year = #{assYear},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTShiftAnnualAssPointsById" parameterType="Long">
+        update t_shift_annual_ass_points set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTShiftAnnualAssPointsByIds" parameterType="String">
+        update t_shift_annual_ass_points set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/shiftmgr/TShiftAnnualAssessmentMapper.xml

@@ -0,0 +1,136 @@
+<?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.shiftmgr.mapper.TShiftAnnualAssessmentMapper">
+    
+    <resultMap type="TShiftAnnualAssessment" id="TShiftAnnualAssessmentResult">
+        <result property="id"    column="id"    />
+        <result property="staffId"    column="staff_id"    />
+        <result property="team"    column="team"    />
+        <result property="leaderId"    column="leader_id"    />
+        <result property="assYear"    column="ass_year"    />
+        <result property="leaderScore"    column="leader_score"    />
+        <result property="foremanScore"    column="foreman_score"    />
+        <result property="directorScore"    column="director_score"    />
+        <result property="engineerScore"    column="engineer_score"    />
+        <result property="managerSocre"    column="manager_socre"    />
+        <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="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTShiftAnnualAssessmentVo">
+        select d.id, d.staff_id, d.team, d.leader_id, d.ass_year, d.leader_score, d.foreman_score, d.director_score, d.engineer_score, d.manager_socre, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_shift_annual_assessment d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTShiftAnnualAssessmentList" parameterType="TShiftAnnualAssessment" resultMap="TShiftAnnualAssessmentResult">
+        <include refid="selectTShiftAnnualAssessmentVo"/>
+        <where>  
+            <if test="staffId != null  and staffId != ''"> and staff_id = #{staffId}</if>
+            <if test="team != null  and team != ''"> and team = #{team}</if>
+            <if test="leaderId != null  and leaderId != ''"> and leader_id = #{leaderId}</if>
+            <if test="assYear != null  and assYear != ''"> and ass_year = #{assYear}</if>
+            <if test="leaderScore != null "> and leader_score = #{leaderScore}</if>
+            <if test="foremanScore != null "> and foreman_score = #{foremanScore}</if>
+            <if test="directorScore != null "> and director_score = #{directorScore}</if>
+            <if test="engineerScore != null "> and engineer_score = #{engineerScore}</if>
+            <if test="managerSocre != null "> and manager_socre = #{managerSocre}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTShiftAnnualAssessmentById" parameterType="Long" resultMap="TShiftAnnualAssessmentResult">
+        <include refid="selectTShiftAnnualAssessmentVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTShiftAnnualAssessment" parameterType="TShiftAnnualAssessment">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT SEQ_T_SHIFT_ANNUAL_ASSESSMENT.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_shift_annual_assessment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="staffId != null">staff_id,</if>
+            <if test="team != null">team,</if>
+            <if test="leaderId != null">leader_id,</if>
+            <if test="assYear != null">ass_year,</if>
+            <if test="leaderScore != null">leader_score,</if>
+            <if test="foremanScore != null">foreman_score,</if>
+            <if test="directorScore != null">director_score,</if>
+            <if test="engineerScore != null">engineer_score,</if>
+            <if test="managerSocre != null">manager_socre,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="staffId != null">#{staffId},</if>
+            <if test="team != null">#{team},</if>
+            <if test="leaderId != null">#{leaderId},</if>
+            <if test="assYear != null">#{assYear},</if>
+            <if test="leaderScore != null">#{leaderScore},</if>
+            <if test="foremanScore != null">#{foremanScore},</if>
+            <if test="directorScore != null">#{directorScore},</if>
+            <if test="engineerScore != null">#{engineerScore},</if>
+            <if test="managerSocre != null">#{managerSocre},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTShiftAnnualAssessment" parameterType="TShiftAnnualAssessment">
+        update t_shift_annual_assessment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="staffId != null">staff_id = #{staffId},</if>
+            <if test="team != null">team = #{team},</if>
+            <if test="leaderId != null">leader_id = #{leaderId},</if>
+            <if test="assYear != null">ass_year = #{assYear},</if>
+            <if test="leaderScore != null">leader_score = #{leaderScore},</if>
+            <if test="foremanScore != null">foreman_score = #{foremanScore},</if>
+            <if test="directorScore != null">director_score = #{directorScore},</if>
+            <if test="engineerScore != null">engineer_score = #{engineerScore},</if>
+            <if test="managerSocre != null">manager_socre = #{managerSocre},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTShiftAnnualAssessmentById" parameterType="Long">
+        update t_shift_annual_assessment set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTShiftAnnualAssessmentByIds" parameterType="String">
+        update t_shift_annual_assessment set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/shiftmgr/assessment.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询年度考核信息列表
+export function listAssessment(query) {
+  return request({
+    url: '/shiftmgr/assessment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询年度考核信息详细
+export function getAssessment(id) {
+  return request({
+    url: '/shiftmgr/assessment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增年度考核信息
+export function addAssessment(data) {
+  return request({
+    url: '/shiftmgr/assessment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改年度考核信息
+export function updateAssessment(data) {
+  return request({
+    url: '/shiftmgr/assessment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除年度考核信息
+export function delAssessment(id) {
+  return request({
+    url: '/shiftmgr/assessment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出年度考核信息
+export function exportAssessment(query) {
+  return request({
+    url: '/shiftmgr/assessment/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/shiftmgr/his.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询年度考核打分记录列表
+export function listHis(query) {
+  return request({
+    url: '/shiftmgr/his/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询年度考核打分记录详细
+export function getHis(id) {
+  return request({
+    url: '/shiftmgr/his/' + id,
+    method: 'get'
+  })
+}
+
+// 新增年度考核打分记录
+export function addHis(data) {
+  return request({
+    url: '/shiftmgr/his',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改年度考核打分记录
+export function updateHis(data) {
+  return request({
+    url: '/shiftmgr/his',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除年度考核打分记录
+export function delHis(id) {
+  return request({
+    url: '/shiftmgr/his/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出年度考核打分记录
+export function exportHis(query) {
+  return request({
+    url: '/shiftmgr/his/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/shiftmgr/points.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询年度考核计分列表
+export function listPoints(query) {
+  return request({
+    url: '/shiftmgr/points/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询年度考核计分详细
+export function getPoints(id) {
+  return request({
+    url: '/shiftmgr/points/' + id,
+    method: 'get'
+  })
+}
+
+// 新增年度考核计分
+export function addPoints(data) {
+  return request({
+    url: '/shiftmgr/points',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改年度考核计分
+export function updatePoints(data) {
+  return request({
+    url: '/shiftmgr/points',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除年度考核计分
+export function delPoints(id) {
+  return request({
+    url: '/shiftmgr/points/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出年度考核计分
+export function exportPoints(query) {
+  return request({
+    url: '/shiftmgr/points/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/shiftmgr/shiftchangemgr/assessment/index.vue

@@ -0,0 +1,579 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="员工ID" prop="staffId">
+        <el-input
+          v-model="queryParams.staffId"
+          placeholder="请输入员工ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组" prop="team">
+        <el-input
+          v-model="queryParams.team"
+          placeholder="请输入班组"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班长ID" prop="leaderId">
+        <el-input
+          v-model="queryParams.leaderId"
+          placeholder="请输入班长ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="考核年度" prop="assYear">
+        <el-input
+          v-model="queryParams.assYear"
+          placeholder="请输入考核年度"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班长打分" prop="leaderScore">
+        <el-input
+          v-model="queryParams.leaderScore"
+          placeholder="请输入班长打分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工长打分" prop="foremanScore">
+        <el-input
+          v-model="queryParams.foremanScore"
+          placeholder="请输入工长打分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主管打分" prop="directorScore">
+        <el-input
+          v-model="queryParams.directorScore"
+          placeholder="请输入主管打分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工程师打分" prop="engineerScore">
+        <el-input
+          v-model="queryParams.engineerScore"
+          placeholder="请输入工程师打分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="经理打分" prop="managerSocre">
+        <el-input
+          v-model="queryParams.managerSocre"
+          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>
+        <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="['shiftmgr:assessment: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="['shiftmgr:assessment: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="['shiftmgr:assessment:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['shiftmgr:assessment:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['shiftmgr:assessment:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="assessmentList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="员工ID" align="center" prop="staffId" :show-overflow-tooltip="true"/>
+      <el-table-column label="班组" align="center" prop="team" :show-overflow-tooltip="true"/>
+      <el-table-column label="班长ID" align="center" prop="leaderId" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核年度" align="center" prop="assYear" :show-overflow-tooltip="true"/>
+      <el-table-column label="班长打分" align="center" prop="leaderScore" :show-overflow-tooltip="true"/>
+      <el-table-column label="工长打分" align="center" prop="foremanScore" :show-overflow-tooltip="true"/>
+      <el-table-column label="主管打分" align="center" prop="directorScore" :show-overflow-tooltip="true"/>
+      <el-table-column label="工程师打分" align="center" prop="engineerScore" :show-overflow-tooltip="true"/>
+      <el-table-column label="经理打分" align="center" prop="managerSocre" :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" 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="['shiftmgr:assessment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['shiftmgr:assessment: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="id">-->
+          <!--<el-input v-model="form.id" placeholder="请输入部门编号" />-->
+        <!--</el-form-item>-->
+        <el-form-item label="员工ID" prop="staffId">
+          <el-input v-model="form.staffId" placeholder="请输入员工ID" />
+        </el-form-item>
+        <el-form-item label="班组" prop="team">
+          <el-input v-model="form.team" placeholder="请输入班组" />
+        </el-form-item>
+        <el-form-item label="班长ID" prop="leaderId">
+          <el-input v-model="form.leaderId" placeholder="请输入班长ID" />
+        </el-form-item>
+        <el-form-item label="考核年度" prop="assYear">
+          <el-input v-model="form.assYear" placeholder="请输入考核年度" />
+        </el-form-item>
+        <el-form-item label="班长打分" prop="leaderScore">
+          <el-input v-model="form.leaderScore" placeholder="请输入班长打分" />
+        </el-form-item>
+        <el-form-item label="工长打分" prop="foremanScore">
+          <el-input v-model="form.foremanScore" placeholder="请输入工长打分" />
+        </el-form-item>
+        <el-form-item label="主管打分" prop="directorScore">
+          <el-input v-model="form.directorScore" placeholder="请输入主管打分" />
+        </el-form-item>
+        <el-form-item label="工程师打分" prop="engineerScore">
+          <el-input v-model="form.engineerScore" placeholder="请输入工程师打分" />
+        </el-form-item>
+        <el-form-item label="经理打分" prop="managerSocre">
+          <el-input v-model="form.managerSocre" 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="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 { listAssessment, getAssessment, delAssessment, addAssessment, updateAssessment, exportAssessment, importTemplate} from "@/api/shiftmgr/assessment";
+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: "Assessment",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 年度考核信息表格数据
+      assessmentList: [],
+      // 弹出层标题
+      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 + "/shiftmgr/assessment/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        staffId: null,
+        team: null,
+        leaderId: null,
+        assYear: null,
+        leaderScore: null,
+        foremanScore: null,
+        directorScore: null,
+        engineerScore: null,
+        managerSocre: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: 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;
+      listAssessment(this.queryParams).then(response => {
+        this.assessmentList = 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,
+        staffId: null,
+        team: null,
+        leaderId: null,
+        assYear: null,
+        leaderScore: null,
+        foremanScore: null,
+        directorScore: null,
+        engineerScore: null,
+        managerSocre: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: 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
+      getAssessment(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) {
+            updateAssessment(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAssessment(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 delAssessment(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有年度考核信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportAssessment(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/shiftmgr/shiftchangemgr/index.vue

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