From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6e2ca95..7de0676 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,17 +1,17 @@
package com.ruoyi.production.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.production.pojo.ProductWorkOrder;
-import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
-import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
+@ApiModel(value = "ProductWorkOrderDto", description = "浜у搧宸ュ崟鍒嗛〉/鎶ュ伐瑙嗚杩斿洖 DTO")
public class ProductWorkOrderDto extends ProductWorkOrder {
//浜у搧鍚嶇О
@@ -43,4 +43,28 @@
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
+
+ @ApiModelProperty("璁″垝宸ユ椂")
+ private BigDecimal salaryQuota;
+
+ @ApiModelProperty("鎶ュ伐浜篒D")
+ private Long[] reportWorkersId;
+
+ @ApiModelProperty("1-鐢熶骇宸ュ崟,2-鐢熶骇鎶ュ伐")
+ @TableField(exist = false)
+ private Integer type;
+
+ @TableField(exist = false)
+ private Long currentUserId;
+
+ /**
+ * 浠婃棩鎶ュ伐鐘舵��(浠� type=2 鏃跺洖濉�)锛�1-鏈紑濮� 2-宸插紑濮�(杩涜涓�) 3-宸茬粨鏉�
+ */
+ @ApiModelProperty("浠婃棩鎶ュ伐鐘舵��(1-鏈紑濮� 2-宸插紑濮� 3-宸茬粨鏉�)")
+ @TableField(exist = false)
+ private Integer todayReportState;
+
+ @ApiModelProperty("鎶ュ伐鏃堕棿鎬诲拰(鍒嗛挓)")
+ @TableField(exist = false)
+ private BigDecimal totalReportDurationMinutes;
}
--
Gitblit v1.9.3