From 32c595247be38014119446b738ab75d192ef910a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 02 四月 2022 12:19:29 +0800
Subject: [PATCH] 优化代码 合同查询加入是否需要审核的功能
---
java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java | 254 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 222 insertions(+), 32 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java b/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
old mode 100644
new mode 100755
index ff611b7..2dc0b54
--- a/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
@@ -22,6 +22,8 @@
* 44 鍚堝悓缁堟
*/
public static final String STATE_FAIL = "33";//33 44
+ public static final String STATE_AUDIT_FINISH = "22";//33 44
+ public static final String STATE_AUDIT_DOING = "55";//33 44
public static final String STATE_COMPLAINT = "44"; //鍚堝悓缁堟
@@ -37,17 +39,26 @@
private String bLink;
private String partyB;
private String contractId;
+ private String[] contractIds;
private String objId;
private String contractName;
+ private String contractNameLike;
private String startTime;
private String endTime;
private String state;
+ private String[] states;
private String[] noStates;
private String stateDesc;
private String contractCode;
private String objType;
private String operatorLink;
private String contractParentId;
+ //
+ //obj_person_name
+ //obj_person_id
+ private String objName;
+ private String objPersonName;
+ private String objPersonId;
private Date createTime;
@@ -58,6 +69,25 @@
private String parentContractCode;
private String parentContractName;
+
+
+ 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 nextUserId;
+
+ private String communityId;
+ private String audit;
+
+ private String hasAudit;
+
+ private String hasEnd;
private List<ContractAttrDto> attrs;
@@ -157,6 +187,14 @@
this.contractId = contractId;
}
+ public String[] getContractIds() {
+ return contractIds;
+ }
+
+ public void setContractIds(String[] contractIds) {
+ this.contractIds = contractIds;
+ }
+
public String getObjId() {
return objId;
}
@@ -171,6 +209,14 @@
public void setContractName(String contractName) {
this.contractName = contractName;
+ }
+
+ public String getContractNameLike() {
+ return contractNameLike;
+ }
+
+ public void setContractNameLike(String contractNameLike) {
+ this.contractNameLike = contractNameLike;
}
public String getStartTime() {
@@ -197,6 +243,30 @@
this.state = state;
}
+ public String[] getStates() {
+ return states;
+ }
+
+ public void setStates(String[] states) {
+ this.states = states;
+ }
+
+ public String[] getNoStates() {
+ return noStates;
+ }
+
+ public void setNoStates(String[] noStates) {
+ this.noStates = noStates;
+ }
+
+ public String getStateDesc() {
+ return stateDesc;
+ }
+
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
+
public String getContractCode() {
return contractCode;
}
@@ -221,6 +291,38 @@
this.operatorLink = operatorLink;
}
+ public String getContractParentId() {
+ return contractParentId;
+ }
+
+ public void setContractParentId(String contractParentId) {
+ this.contractParentId = contractParentId;
+ }
+
+ public String getObjName() {
+ return objName;
+ }
+
+ public void setObjName(String objName) {
+ this.objName = objName;
+ }
+
+ public String getObjPersonName() {
+ return objPersonName;
+ }
+
+ public void setObjPersonName(String objPersonName) {
+ this.objPersonName = objPersonName;
+ }
+
+ public String getObjPersonId() {
+ return objPersonId;
+ }
+
+ public void setObjPersonId(String objPersonId) {
+ this.objPersonId = objPersonId;
+ }
+
public Date getCreateTime() {
return createTime;
}
@@ -235,14 +337,6 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
- }
-
- public List<ContractAttrDto> getAttrs() {
- return attrs;
- }
-
- public void setAttrs(List<ContractAttrDto> attrs) {
- this.attrs = attrs;
}
public String getContractTypeName() {
@@ -261,30 +355,6 @@
this.stateName = stateName;
}
- public String getStateDesc() {
- return stateDesc;
- }
-
- public void setStateDesc(String stateDesc) {
- this.stateDesc = stateDesc;
- }
-
- public String[] getNoStates() {
- return noStates;
- }
-
- public void setNoStates(String[] noStates) {
- this.noStates = noStates;
- }
-
- public String getContractParentId() {
- return contractParentId;
- }
-
- public void setContractParentId(String contractParentId) {
- this.contractParentId = contractParentId;
- }
-
public String getParentContractCode() {
return parentContractCode;
}
@@ -300,4 +370,124 @@
public void setParentContractName(String parentContractName) {
this.parentContractName = parentContractName;
}
+
+ 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 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 getStartUserId() {
+ return startUserId;
+ }
+
+ public void setStartUserId(String startUserId) {
+ this.startUserId = startUserId;
+ }
+
+ public String getCommunityId() {
+ return communityId;
+ }
+
+ public void setCommunityId(String communityId) {
+ this.communityId = communityId;
+ }
+
+ public List<ContractAttrDto> getAttrs() {
+ return attrs;
+ }
+
+ public void setAttrs(List<ContractAttrDto> attrs) {
+ this.attrs = attrs;
+ }
+
+ public String getNextUserId() {
+ return nextUserId;
+ }
+
+ public void setNextUserId(String nextUserId) {
+ this.nextUserId = nextUserId;
+ }
+
+ public String getHasAudit() {
+ return hasAudit;
+ }
+
+ public void setHasAudit(String hasAudit) {
+ this.hasAudit = hasAudit;
+ }
+
+ public String getHasEnd() {
+ return hasEnd;
+ }
+
+ public void setHasEnd(String hasEnd) {
+ this.hasEnd = hasEnd;
+ }
+
+ public String getAudit() {
+ return audit;
+ }
+
+ public void setAudit(String audit) {
+ this.audit = audit;
+ }
}
--
Gitblit v1.8.0