修改商户余额资金流水

src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java

@@ -31,7 +31,12 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")
                 .add("examineStatus","and examine_status = ?")
-                .add("companyId","and invitation_company_id = ? ");
+                .add("companyId","and invitation_company_id = ? ")
+                .add("contactName","and contact_name = ? ")
+                .add("contactPhone","and contact_phone = ? ")
+                .add("status","and status = ? ")
+                .add("startDate","and create_time >= ? ")
+                .add("endDate","and create_time <= ? ");
 
         getSql(DaoConst.LOAD).addCode("{FIELD}", ",b.*", "{INNER}", "INNER JOIN pd_company_extend b ON a.id = b.id");
 

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -892,6 +892,7 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     public PageSizeData<CompanyResVo> myInvite(ListCompanyReqVo reqVo) {
+        reqVo.setStatus(6);
         return companyDao.getCompanyList(reqVo);
     }
 

src/main/java/com/pangding/web/authority/vo/reqvo/ListCompanyReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
 import com.yanzuoguang.util.vo.PageSizeReqVo;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author zhangjinyao
@@ -9,22 +10,34 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
 public class ListCompanyReqVo extends PageSizeReqVo {
     private String reqId;
 
+    @ApiModelProperty(notes = "公司名称")
     private String companyName;
-
+    @ApiModelProperty(notes = "公司类型")
     private String companyType;
-
-    private String companyAttribute;
-
+    @ApiModelProperty(notes = "公司属性: 0:其他;1:景区；2:酒店；3:餐饮；4:特产；5:运营车,6.团队）")
+    private Integer companyAttribute;
+    @ApiModelProperty(notes = "审核状态")
     private String examineStatus;
-
+    @ApiModelProperty(notes = "公司编号")
     private String companyId;
 
-    public String getCompanyId() {
-        return companyId;
+    @ApiModelProperty(notes = "联系人")
+    private String contactName;
+    @ApiModelProperty(notes = "联系人电话")
+    private String contactPhone;
+    @ApiModelProperty(notes = "公司状态")
+    private Integer status;
+    @ApiModelProperty(notes = "开始时间")
+    private String startDate;
+    @ApiModelProperty(notes = "结束时间")
+    private String endDate;
+
+    public String getReqId() {
+        return reqId;
     }
 
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
     }
 
     public String getCompanyName() {
@@ -43,11 +56,11 @@ public class ListCompanyReqVo extends PageSizeReqVo {
         this.companyType = companyType;
     }
 
-    public String getCompanyAttribute() {
+    public Integer getCompanyAttribute() {
         return companyAttribute;
     }
 
-    public void setCompanyAttribute(String companyAttribute) {
+    public void setCompanyAttribute(Integer companyAttribute) {
         this.companyAttribute = companyAttribute;
     }
 
@@ -59,11 +72,51 @@ public class ListCompanyReqVo extends PageSizeReqVo {
         this.examineStatus = examineStatus;
     }
 
-    public String getReqId() {
-        return reqId;
+    public String getCompanyId() {
+        return companyId;
     }
 
-    public void setReqId(String reqId) {
-        this.reqId = reqId;
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
     }
 }