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/ProductionProductMainDto.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index f34124b..a19c083 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,17 +1,23 @@
package com.ruoyi.production.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionProductMain;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
@ExcelIgnoreUnannotated
+@ApiModel(value = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鍙拌处/鏄庣粏 DTO")
public class ProductionProductMainDto extends ProductionProductMain {
@ApiModelProperty(value = "宸ュ崟缂栧彿")
@Excel(name = "宸ュ崟缂栧彿")
@@ -30,7 +36,7 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
@Excel(name = "鎶ュ簾鏁伴噺")
- private BigDecimal scrapQty;
+ private BigDecimal scrapQty = BigDecimal.ZERO;
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
@@ -48,10 +54,55 @@
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- private LocalDate scheduleDate;
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+ @Excel(name = "鐢熶骇璁㈠崟鍙�")
+ private String productOrderNpsNo;
+
+ @ApiModelProperty(value = "寮�濮嬫棩鏈�(鏄庣粏鏌ヨ鐢�)")
+ private LocalDate startDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃ユ湡(鏄庣粏鏌ヨ鐢�)")
+ private LocalDate endDate;
+
+ @ApiModelProperty(value = "宸ュ崟ID鍒楄〃(鏄庣粏瀵煎嚭鐢�)")
+ private List<Long> workOrderIds;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏃ユ湡(鏄庣粏/姹囨�讳腑浣跨敤)")
+ private LocalDate schedulingDate;
private String schedulingUserName;
private String customerName;
+ //宸ュ簭
+ @Excel(name = "宸ュ簭")
private String process;
private BigDecimal workHours;
private BigDecimal wages;
+
+ @ApiModelProperty(value = "鎶ュ伐鍔ㄤ綔 1-寮�濮� 2-缁撴潫")
+ private Integer actionType;
+
+ @ApiModelProperty(value = "瀹為檯鎶ュ伐鏃堕暱(鍒嗛挓)")
+ @Excel(name = "瀹為檯鎶ュ伐鏃堕暱(鍒嗛挓)")
+ private BigDecimal reportDurationMinutes;
+
+ @ApiModelProperty(value = "椤圭洰鎬诲伐鏃�(灏忔椂)")
+ private BigDecimal projectTotalHours;
+
+ @ApiModelProperty(value = "宸ュ簭鏍囧噯宸ユ椂(灏忔椂)")
+ private BigDecimal processStandardHours;
+
+ @ApiModelProperty(value = "瀹為檯鎶ュ伐宸ユ椂(灏忔椂)")
+ private BigDecimal actualReportHours;
+
+ @ApiModelProperty(value = "姣忔棩浜哄憳宸ユ椂(灏忔椂)")
+ private BigDecimal dailyPersonHours;
+
+ @ApiModelProperty(value = "浜у嚭鎬绘暟閲�")
+ private BigDecimal outputTotalQuantity;
+
+ @ApiModelProperty(value = "鎶ュ簾鎬绘暟閲�")
+ private BigDecimal scrapTotalQuantity;
+
+
}
--
Gitblit v1.9.3