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/production/bean/vo/ProductionAccountVo.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java
index 47cb059..68bcb23 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java
@@ -8,7 +8,7 @@
import java.time.LocalDate;
@Data
-@Schema(name = "ProductionAccountVo", description = "鐢熶骇鏍哥畻鍒嗛〉杩斿洖瀵硅薄")
+@Schema(name = "ProductionAccountVo", description = "鐢熶骇鏍哥畻鍒嗛〉缁撴灉")
public class ProductionAccountVo {
@Schema(description = "瀹㈡埛鍚堝悓鍙�")
@@ -20,7 +20,7 @@
@Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @Schema(description = "浜у搧澶х被")
+ @Schema(description = "浜у搧绫诲埆")
private String productCategory;
@Schema(description = "瑙勬牸鍨嬪彿")
@@ -29,28 +29,34 @@
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "鐢熶骇浜篒D")
+ @Schema(description = "鎺掍骇浜哄憳ID")
private Long schedulingUserId;
- @Schema(description = "鐢熶骇浜哄悕绉�")
+ @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
private String schedulingUserName;
@Schema(description = "宸ヨ祫")
private BigDecimal wages;
- @Schema(description = "鐢熶骇鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal finishedNum;
- @Schema(description = "宸ユ椂瀹氶")
+ @Schema(description = "宸ヨ祫瀹氶")
private BigDecimal workHours;
+
+ @Schema(description = "宸ユ椂")
+ private BigDecimal workHour;
+
+ @Schema(description = "浜у嚭鐜�")
+ private String outputRate;
@Schema(description = "宸ュ簭")
private String process;
- @Schema(description = "鐢熶骇鏃ユ湡")
+ @Schema(description = "鎺掍骇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate schedulingDate;
- @Schema(description = "鐢熶骇鏈堜唤(yyyy-MM)")
+ @Schema(description = "鎺掍骇鏈堜唤(yyyy-MM)")
private String schedulingMonth;
}
--
Gitblit v1.9.3