From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 151 insertions(+), 5 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 7755bef..a6a1d8d
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -17,6 +17,19 @@
**/
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;
@@ -30,11 +43,8 @@
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;
@@ -42,10 +52,28 @@
private String auditMessage;
private String staffId;
private String staffName;
+ private String nextStaffId;
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 assigneeUser;
+ //鐘舵�佹爣璇�
+ private String noticeState;
+ //鏌ヨ褰撴湀鏁版嵁鏍囪瘑
+ private String urgentFlag;
public String getResOrderType() {
return resOrderType;
@@ -102,7 +130,6 @@
public void setUserId(String userId) {
this.userId = userId;
}
-
public String getCreateTime() {
return createTime;
@@ -184,7 +211,6 @@
this.bId = bId;
}
-
public String getEndUserName() {
return endUserName;
}
@@ -232,4 +258,124 @@
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;
+ }
+
+ public String getAssigneeUser() {
+ return assigneeUser;
+ }
+
+ public void setAssigneeUser(String assigneeUser) {
+ this.assigneeUser = assigneeUser;
+ }
+
+ public String getNextStaffId() {
+ return nextStaffId;
+ }
+
+ public void setNextStaffId(String nextStaffId) {
+ this.nextStaffId = nextStaffId;
+ }
}
--
Gitblit v1.8.0