绩效管理：工时汇总对接MES数据&人员考勤调整

zouyu

昨天 1b2f1eb44d9f0de6b9238cfe314988a95c87344a

 performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryAllDto.java

@@ -1,5 +1,7 @@
package com.ruoyi.performance.dto;

import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -18,22 +20,88 @@
@NoArgsConstructor
public class AuxiliaryAllDto {

    @ApiModelProperty("产量工时")
    private BigDecimal yieldHour;

    @ApiModelProperty("辅助工时")
    private BigDecimal subsidiaryHour;

    @ApiModelProperty("总工时")
    private BigDecimal totalHour;

    @ExcelIgnore
    @ApiModelProperty("人员id")
    private Integer userId;

    @ApiModelProperty("姓名")
    private String userName;

    @ExcelIgnore
    @ApiModelProperty("月份")
    private String month;

    @ExcelProperty(value = {"序号","序号"},index = 0)
    @ApiModelProperty("导出序号")
    private Integer excelIndex;

    @ExcelProperty(value = {"姓名","姓名"},index = 1)
    @ApiModelProperty("姓名")
    private String userName;

    @ExcelProperty(value = {"耐丝域MES","工序绩效"},index = 2)
    @ApiModelProperty("工序绩效-耐丝域")
    private BigDecimal operationPerformanceByNS = BigDecimal.ZERO;

    @ExcelProperty(value = {"耐丝域MES","成品绩效"},index = 3)
    @ApiModelProperty("成品绩效-耐丝域")
    private BigDecimal productPerformanceByNS = BigDecimal.ZERO;

    @ExcelProperty(value = {"耐丝域MES","巡检绩效"},index = 4)
    @ApiModelProperty("巡检绩效-耐丝域")
    private BigDecimal onsiteInspWageByNS = BigDecimal.ZERO;

    @ExcelProperty(value = {"耐丝域MES","杂工工资"},index = 5)
    @ApiModelProperty("杂工工资-耐丝域")
    private BigDecimal handymanWageByNS = BigDecimal.ZERO;

    @ExcelProperty(value = {"科技域MES","工序绩效"},index = 6)
    @ApiModelProperty("工序绩效-科技域")
    private BigDecimal operationPerformanceByKJ = BigDecimal.ZERO;

    @ExcelProperty(value = {"科技域MES","成品绩效"},index = 7)
    @ApiModelProperty("成品绩效-科技域")
    private BigDecimal productPerformanceByKJ = BigDecimal.ZERO;

    @ExcelProperty(value = {"科技域MES","巡检绩效"},index = 8)
    @ApiModelProperty("巡检绩效-科技域")
    private BigDecimal onsiteInspWageByKJ = BigDecimal.ZERO;

    @ExcelProperty(value = {"科技域MES","杂工工资"},index = 9)
    @ApiModelProperty("杂工工资-科技域")
    private BigDecimal handymanWageByKJ = BigDecimal.ZERO;

    @ExcelProperty(value = {"MES汇总","工序绩效"},index = 10)
    @ApiModelProperty("工序绩效-科技域")
    private BigDecimal operationPerformance = BigDecimal.ZERO;

    @ExcelProperty(value = {"MES汇总","成品绩效"},index = 11)
    @ApiModelProperty("成品绩效-科技域")
    private BigDecimal productPerformance = BigDecimal.ZERO;

    @ExcelProperty(value = {"MES汇总","巡检绩效"},index = 12)
    @ApiModelProperty("巡检绩效-科技域")
    private BigDecimal onsiteInspWage = BigDecimal.ZERO;

    @ExcelProperty(value = {"MES汇总","杂工工资"},index = 13)
    @ApiModelProperty("杂工工资-科技域")
    private BigDecimal handymanWage = BigDecimal.ZERO;

    @ExcelProperty(value = {"LIMS","产量工时"},index = 14)
    @ApiModelProperty("产量工时")
    private BigDecimal yieldHour;

    @ExcelProperty(value = {"LIMS","辅助工时"},index = 15)
    @ApiModelProperty("辅助工时")
    private BigDecimal subsidiaryHour;

    @ExcelProperty(value = {"LIMS","总工时"},index = 16)
    @ApiModelProperty("总工时")
    private BigDecimal totalHour;

    public AuxiliaryAllDto(BigDecimal yieldHour, BigDecimal subsidiaryHour, BigDecimal totalHour, Integer userId, String userName, String month) {
        this.yieldHour = yieldHour;
        this.subsidiaryHour = subsidiaryHour;
        this.totalHour = totalHour;
        this.userId = userId;
        this.userName = userName;
        this.month = month;
    }
}