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 |  163 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 115 insertions(+), 48 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 81893ff..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
@@ -23,6 +23,7 @@
      */
     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"; //鍚堝悓缁堟
 
@@ -41,9 +42,11 @@
     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;
@@ -77,6 +80,14 @@
     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;
 
@@ -176,6 +187,14 @@
         this.contractId = contractId;
     }
 
+    public String[] getContractIds() {
+        return contractIds;
+    }
+
+    public void setContractIds(String[] contractIds) {
+        this.contractIds = contractIds;
+    }
+
     public String getObjId() {
         return objId;
     }
@@ -190,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() {
@@ -216,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;
     }
@@ -240,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;
     }
@@ -256,14 +339,6 @@
         this.statusCd = statusCd;
     }
 
-    public List<ContractAttrDto> getAttrs() {
-        return attrs;
-    }
-
-    public void setAttrs(List<ContractAttrDto> attrs) {
-        this.attrs = attrs;
-    }
-
     public String getContractTypeName() {
         return contractTypeName;
     }
@@ -278,30 +353,6 @@
 
     public void setStateName(String stateName) {
         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() {
@@ -392,35 +443,51 @@
         this.startUserId = startUserId;
     }
 
-    public String[] getContractIds() {
-        return contractIds;
+    public String getCommunityId() {
+        return communityId;
     }
 
-    public void setContractIds(String[] contractIds) {
-        this.contractIds = contractIds;
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
     }
 
-    public String getObjName() {
-        return objName;
+    public List<ContractAttrDto> getAttrs() {
+        return attrs;
     }
 
-    public void setObjName(String objName) {
-        this.objName = objName;
+    public void setAttrs(List<ContractAttrDto> attrs) {
+        this.attrs = attrs;
     }
 
-    public String getObjPersonName() {
-        return objPersonName;
+    public String getNextUserId() {
+        return nextUserId;
     }
 
-    public void setObjPersonName(String objPersonName) {
-        this.objPersonName = objPersonName;
+    public void setNextUserId(String nextUserId) {
+        this.nextUserId = nextUserId;
     }
 
-    public String getObjPersonId() {
-        return objPersonId;
+    public String getHasAudit() {
+        return hasAudit;
     }
 
-    public void setObjPersonId(String objPersonId) {
-        this.objPersonId = objPersonId;
+    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