From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改

---
 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