From 1b2f1eb44d9f0de6b9238cfe314988a95c87344a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 四月 2026 13:37:15 +0800
Subject: [PATCH] 绩效管理：工时汇总对接MES数据&人员考勤调整
---
performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryAllDto.java | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryAllDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryAllDto.java
index 88fadc0..ccbfe31 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryAllDto.java
+++ b/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 = {"鑰愪笣鍩烳ES","宸ュ簭缁╂晥"},index = 2)
+ @ApiModelProperty("宸ュ簭缁╂晥-鑰愪笣鍩�")
+ private BigDecimal operationPerformanceByNS = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"鑰愪笣鍩烳ES","鎴愬搧缁╂晥"},index = 3)
+ @ApiModelProperty("鎴愬搧缁╂晥-鑰愪笣鍩�")
+ private BigDecimal productPerformanceByNS = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"鑰愪笣鍩烳ES","宸℃缁╂晥"},index = 4)
+ @ApiModelProperty("宸℃缁╂晥-鑰愪笣鍩�")
+ private BigDecimal onsiteInspWageByNS = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"鑰愪笣鍩烳ES","鏉傚伐宸ヨ祫"},index = 5)
+ @ApiModelProperty("鏉傚伐宸ヨ祫-鑰愪笣鍩�")
+ private BigDecimal handymanWageByNS = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"绉戞妧鍩烳ES","宸ュ簭缁╂晥"},index = 6)
+ @ApiModelProperty("宸ュ簭缁╂晥-绉戞妧鍩�")
+ private BigDecimal operationPerformanceByKJ = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"绉戞妧鍩烳ES","鎴愬搧缁╂晥"},index = 7)
+ @ApiModelProperty("鎴愬搧缁╂晥-绉戞妧鍩�")
+ private BigDecimal productPerformanceByKJ = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"绉戞妧鍩烳ES","宸℃缁╂晥"},index = 8)
+ @ApiModelProperty("宸℃缁╂晥-绉戞妧鍩�")
+ private BigDecimal onsiteInspWageByKJ = BigDecimal.ZERO;
+
+ @ExcelProperty(value = {"绉戞妧鍩烳ES","鏉傚伐宸ヨ祫"},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;
+ }
}
--
Gitblit v1.9.3