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/pojo/ProductProcess.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 8f8211f..207890b 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -1,9 +1,7 @@
package com.ruoyi.production.pojo;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +13,6 @@
@TableName("product_process")
@Data
-@ExcelIgnoreUnannotated
@ApiModel(value = "productProcess", description = "宸ュ簭琛�")
public class ProductProcess implements Serializable {
@@ -24,34 +21,37 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 浜у搧瑙勬牸ID
+ */
+ private Long productModelId;
+
/**
* 宸ュ簭鍚嶇О
*/
- @Excel(name = "宸ュ簭鍚嶇О")
private String name;
/**
* 宸ュ簭缂栧彿
*/
- @Excel(name = "宸ュ簭缂栧彿")
private String no;
-
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞")
- private String remark;
/**
* 宸ヨ祫瀹氶
*/
- @Excel(name = "宸ヨ祫瀹氶")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
- @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
- private Long type;
+
+ @ApiModelProperty("绫诲瀷1-鍔犲伐锛�2-鍒澘鍐疯姱鍒朵綔銆�3-绠¤矾缁勫銆�4-缃愪綋杩炴帴鍙婅皟璇曪紝5-娴嬭瘯鎵撳帇锛�6-鍏朵粬")
+ private Integer type;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
/**
* 鍒涘缓鏃堕棿
@@ -75,7 +75,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value ="鏄惁璐ㄦ")
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
private Boolean isQuality;
@@ -86,4 +86,10 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @ApiModelProperty("璁″垝浜哄憳ID")
+ private Long plannerId;
+
+ @ApiModelProperty("璁″垝浜哄憳濮撳悕")
+ private String plannerName;
+
}
--
Gitblit v1.9.3