From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作

---
 src/main/java/com/whyc/pojo/WorksheetMain.java |   69 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/pojo/WorksheetMain.java b/src/main/java/com/whyc/pojo/WorksheetMain.java
index 422191b..676703e 100644
--- a/src/main/java/com/whyc/pojo/WorksheetMain.java
+++ b/src/main/java/com/whyc/pojo/WorksheetMain.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.whyc.config.EnumWorksheetType;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.ibatis.type.Alias;
 
@@ -29,7 +30,7 @@
     private Integer level;
     /**
      * 宸ュ崟鐘舵��:
-     * 0:鍛樺伐澶勭悊涓�(宸查┏鍥�)
+     * 0:宸查┏鍥炲埌鎵�灞炰汉,瀹岀粨
      * 1:缁忕悊澶勭悊涓�
      * 2:鎬荤粡鐞嗗鐞嗕腑
      * 5:褰掓。
@@ -37,6 +38,12 @@
     private Integer status;
     @ApiModelProperty("宸ュ崟缁撴潫鎰忚")
     private String endReason;
+
+    /**
+     * {@link EnumWorksheetType#getType()}
+     */
+    @ApiModelProperty("宸ュ崟绫诲瀷:1-bom,2-鏁ｈ浠�,3-bom-鏁ｈ浠�")
+    private Integer type;
 
     @ApiModelProperty("娴佺▼鐨勪笅涓鐞嗕汉")
     @TableField(exist = false)
@@ -47,14 +54,24 @@
     private String dealDesc;
 
     @TableField(exist = false)
-    private String createUser;
+    private DocUser createUser;
 
-    @ApiModelProperty("寰呭鎵逛骇鍝乥om")
+    @ApiModelProperty("寰呭鎵逛骇鍝�")
     @TableField(exist = false)
-    private List<ProductBomApproving> approvingBomList;
+    private ProductApproving productApproving;
 
     @TableField(exist = false)
     private LinkedList<WorksheetLink> links;
+
+    @TableField(exist = false)
+    private DocUser approvingUser;
+
+    @ApiModelProperty("寰呭鎵圭墿鏂�")
+    @TableField(exist = false)
+    private List<MaterialApproving> mApprovingList;
+
+    @TableField(exist = false)
+    private List<MaterialProductApproving> mpApprovingList;
 
     public Integer getId() {
         return id;
@@ -152,11 +169,11 @@
         this.status = status;
     }
 
-    public String getCreateUser() {
+    public DocUser getCreateUser() {
         return createUser;
     }
 
-    public void setCreateUser(String createUser) {
+    public void setCreateUser(DocUser createUser) {
         this.createUser = createUser;
     }
 
@@ -168,11 +185,43 @@
         this.links = links;
     }
 
-    public List<ProductBomApproving> getApprovingBomList() {
-        return approvingBomList;
+    public ProductApproving getProductApproving() {
+        return productApproving;
     }
 
-    public void setApprovingBomList(List<ProductBomApproving> approvingBomList) {
-        this.approvingBomList = approvingBomList;
+    public void setProductApproving(ProductApproving productApproving) {
+        this.productApproving = productApproving;
+    }
+
+    public DocUser getApprovingUser() {
+        return approvingUser;
+    }
+
+    public void setApprovingUser(DocUser approvingUser) {
+        this.approvingUser = approvingUser;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public List<MaterialApproving> getMApprovingList() {
+        return mApprovingList;
+    }
+
+    public void setMApprovingList(List<MaterialApproving> mApprovingList) {
+        this.mApprovingList = mApprovingList;
+    }
+
+    public List<MaterialProductApproving> getMpApprovingList() {
+        return mpApprovingList;
+    }
+
+    public void setMpApprovingList(List<MaterialProductApproving> mpApprovingList) {
+        this.mpApprovingList = mpApprovingList;
     }
 }

--
Gitblit v1.9.1