From 9010b5b3d735abc84c61a88eb2f1483c3acf440f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:12:16 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段
---
src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
index 99d9e61..852bbf8 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
@@ -1,25 +1,21 @@
package com.ruoyi.home.dto;
-
-import com.ruoyi.production.dto.ProductOrderDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
@Data
-@ApiModel
+@Schema
public class ProductionProgressDto {
- @ApiModelProperty("鎬昏鍗曟暟")
- private Integer totalOrderCount;
+ @Schema(description = "鎬昏鍗曟暟")
+ private Long totalOrderCount;
- @ApiModelProperty("宸插畬鎴愯鍗曟暟")
- private Integer completedOrderCount;
- @ApiModelProperty("鏈畬鎴愯鍗曟暟")
- private Integer uncompletedOrderCount;
- @ApiModelProperty("鎬讳綋瀹屾垚杩涘害")
- private BigDecimal completedProgressCount;
- @ApiModelProperty("璁㈠崟璇︽儏")
- private List<ProductOrderDto> completedOrderDetails;
+ @Schema(description = "宸插畬鎴愯鍗曟暟")
+ private Long completedOrderCount;
+ @Schema(description = "鏈畬鎴愯鍗曟暟")
+ private Long uncompletedOrderCount;
+ @Schema(description = "閮ㄥ垎瀹屾垚璁㈠崟鏁�")
+ private Long partialCompletedOrderCount;
+ @Schema(description = "璁㈠崟璇︽儏")
+ private List<ProductionProgressOrderDto> completedOrderDetails;
}
--
Gitblit v1.9.3