From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java |  272 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 265 insertions(+), 7 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
old mode 100644
new mode 100755
index ba53bc9..3eba0ce
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -1,9 +1,11 @@
 package com.java110.dto.purchaseApply;
 
 import com.java110.dto.PageDto;
+import com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,20 +17,61 @@
  **/
 public class PurchaseApplyDto extends PageDto implements Serializable {
 
+    public static final String RES_ORDER_TYPE_ENTER = "10000"; //閲囪喘鍏ュ簱
+    public static final String RES_ORDER_TYPE_OUT = "20000"; //鍑哄簱
+    public static final String STATE_WAIT_DEAL = "1000"; // 绛夊緟澶勭悊
+    public static final String STATE_DEALING = "1001"; // 瀹℃牳涓�
+    public static final String STATE_AUDITED = "1002"; // 宸插鏍�
+    public static final String STATE_END = "1003"; // 瀹岀粨
+    public static final String STATE_NOT_PASS = "1004"; // 鏈�氳繃
+    public static final String WAREHOUSING_TYPE_DIRECT = "10000"; // 鐩存帴鍏ュ簱/鍑哄簱
+    public static final String WAREHOUSING_TYPE_APPLY = "20000"; // 閲囪喘鐢宠鍏ュ簱/鍑哄簱
+    public static final String WAREHOUSING_TYPE_URGENT = "30000"; //绱ф�ラ噰璐叆搴�
+    public static final String WEIGHTED_MEAN_TRUE = "10000"; //璁$畻鍧囦环
+    public static final String WEIGHTED_MEAN_FALSE = "20000";
+
     private String resOrderType;
     private String description;
     private String applyOrderId;
+    private String[] applyOrderIds;
+    private String bId;
     private String state;
     private String storeId;
     private String userName;
     private String userId;
-
-
-    private Date createTime;
-
+    private String stateName;
+    private String endUserName;
+    private String endUserTel;
+    private List<PurchaseApplyDetailVo> purchaseApplyDetailVo;
+    private String createTime;
     private String statusCd = "0";
+    private String currentUserId;
+    private String processInstanceId;
+    private String taskId;
+    private String auditCode;
+    private String auditMessage;
+    private String staffId;
+    private String staffName;
+    private String staffTel;
+    private String startUserId;
+    private String warehousingWay;
+    private String createUserId;
+    private String createUserName;
+    private String price;
+    private String supplierName;
+    private String communityId;
 
+    //涓嬬骇澶勭悊浜篿d
+    private String taskUserId;
+    private String actRuTaskId;
+    private String procDefId;
+    private String businessKey;
 
+    //鐘舵�佹爣璇�
+    private String noticeState;
+
+    //鏌ヨ褰撴湀鏁版嵁鏍囪瘑
+    private String urgentFlag;
 
     public String getResOrderType() {
         return resOrderType;
@@ -86,12 +129,11 @@
         this.userId = userId;
     }
 
-
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
@@ -102,4 +144,220 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getCurrentUserId() {
+        return currentUserId;
+    }
+
+    public void setCurrentUserId(String currentUserId) {
+        this.currentUserId = currentUserId;
+    }
+
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getAuditCode() {
+        return auditCode;
+    }
+
+    public void setAuditCode(String auditCode) {
+        this.auditCode = auditCode;
+    }
+
+    public String getAuditMessage() {
+        return auditMessage;
+    }
+
+    public void setAuditMessage(String auditMessage) {
+        this.auditMessage = auditMessage;
+    }
+
+    public List<PurchaseApplyDetailVo> getPurchaseApplyDetailVo() {
+        return purchaseApplyDetailVo;
+    }
+
+    public void setPurchaseApplyDetailVo(List<PurchaseApplyDetailVo> purchaseApplyDetailVo) {
+        this.purchaseApplyDetailVo = purchaseApplyDetailVo;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getEndUserName() {
+        return endUserName;
+    }
+
+    public void setEndUserName(String endUserName) {
+        this.endUserName = endUserName;
+    }
+
+    public String getEndUserTel() {
+        return endUserTel;
+    }
+
+    public void setEndUserTel(String endUserTel) {
+        this.endUserTel = endUserTel;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getStaffTel() {
+        return staffTel;
+    }
+
+    public void setStaffTel(String staffTel) {
+        this.staffTel = staffTel;
+    }
+
+    public String[] getApplyOrderIds() {
+        return applyOrderIds;
+    }
+
+    public void setApplyOrderIds(String[] applyOrderIds) {
+        this.applyOrderIds = applyOrderIds;
+    }
+
+    public String getStartUserId() {
+        return startUserId;
+    }
+
+    public void setStartUserId(String startUserId) {
+        this.startUserId = startUserId;
+    }
+
+    public String getWarehousingWay() {
+        return warehousingWay;
+    }
+
+    public void setWarehousingWay(String warehousingWay) {
+        this.warehousingWay = warehousingWay;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getTaskUserId() {
+        return taskUserId;
+    }
+
+    public void setTaskUserId(String taskUserId) {
+        this.taskUserId = taskUserId;
+    }
+
+    public String getActRuTaskId() {
+        return actRuTaskId;
+    }
+
+    public void setActRuTaskId(String actRuTaskId) {
+        this.actRuTaskId = actRuTaskId;
+    }
+
+    public String getProcDefId() {
+        return procDefId;
+    }
+
+    public void setProcDefId(String procDefId) {
+        this.procDefId = procDefId;
+    }
+
+    public String getBusinessKey() {
+        return businessKey;
+    }
+
+    public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getNoticeState() {
+        return noticeState;
+    }
+
+    public void setNoticeState(String noticeState) {
+        this.noticeState = noticeState;
+    }
+
+    public String getUrgentFlag() {
+        return urgentFlag;
+    }
+
+    public void setUrgentFlag(String urgentFlag) {
+        this.urgentFlag = urgentFlag;
+    }
 }

--
Gitblit v1.8.0