From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
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