增加租户的功能

This commit is contained in:
季圣华
2019-03-19 23:11:38 +08:00
parent d845b9dfbe
commit 54bf489723
103 changed files with 23174 additions and 21773 deletions

View File

@@ -1,73 +1,13 @@
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import com.jsh.erp.datasource.entities.AccountItem;
public class AccountItemVo4List {
private Long id;
private Long headerid;
private Long accountid;
private Long inoutitemid;
private BigDecimal eachamount;
private String remark;
public class AccountItemVo4List extends AccountItem {
private String accountName;
private String inOutItemName;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public Long getInoutitemid() {
return inoutitemid;
}
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
public BigDecimal getEachamount() {
return eachamount;
}
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getAccountName() {
return accountName;
}

View File

@@ -20,6 +20,8 @@ public class AccountVo4InOutList {
private String amList;
private Long tenantId;
public String getNumber() {
return number;
}
@@ -83,4 +85,12 @@ public class AccountVo4InOutList {
public void setAmList(String amList) {
this.amList = amList;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

View File

@@ -1,81 +1,11 @@
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import com.jsh.erp.datasource.entities.Account;
public class AccountVo4List {
private Long id;
private String name;
private String serialno;
private BigDecimal initialamount;
private BigDecimal currentamount;
private String remark;
private Boolean isdefault;
public class AccountVo4List extends Account{
private String thismonthamount;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSerialno() {
return serialno;
}
public void setSerialno(String serialno) {
this.serialno = serialno;
}
public BigDecimal getInitialamount() {
return initialamount;
}
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
}
public BigDecimal getCurrentamount() {
return currentamount;
}
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Boolean getIsdefault() {
return isdefault;
}
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
public String getThismonthamount() {
return thismonthamount;
}

View File

@@ -26,6 +26,8 @@ public class DepotHeadVo4InDetail {
private String NewType;
private Long tenantId;
public String getNumber() {
return Number;
}
@@ -105,4 +107,12 @@ public class DepotHeadVo4InDetail {
public void setNewType(String newType) {
NewType = newType;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

View File

@@ -17,6 +17,8 @@ public class DepotHeadVo4InOutMCount {
private BigDecimal priceSum;
private Long tenantId;
public Long getMaterialId() {
return MaterialId;
}
@@ -64,4 +66,12 @@ public class DepotHeadVo4InOutMCount {
public void setPriceSum(BigDecimal priceSum) {
this.priceSum = priceSum;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

View File

@@ -1,67 +1,11 @@
package com.jsh.erp.datasource.vo;
import com.jsh.erp.datasource.entities.DepotHead;
import java.math.BigDecimal;
import java.util.Date;
public class DepotHeadVo4List {
private Long id;
private String type;
private String subtype;
private Long projectid;
private String defaultnumber;
private String number;
private String operpersonname;
private Date createtime;
private Date opertime;
private Long organid;
private Long handspersonid;
private Long accountid;
private BigDecimal changeamount;
private Long allocationprojectid;
private BigDecimal totalprice;
private String paytype;
private String remark;
private String salesman;
private String accountidlist;
private String accountmoneylist;
private BigDecimal discount;
private BigDecimal discountmoney;
private BigDecimal discountlastmoney;
private BigDecimal othermoney;
private String othermoneylist;
private String othermoneyitem;
private Integer accountday;
private String status;
private String linknumber;
public class DepotHeadVo4List extends DepotHead{
private String projectName;
@@ -77,238 +21,6 @@ public class DepotHeadVo4List {
private String opertimeStr;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getSubtype() {
return subtype;
}
public void setSubtype(String subtype) {
this.subtype = subtype;
}
public Long getProjectid() {
return projectid;
}
public void setProjectid(Long projectid) {
this.projectid = projectid;
}
public String getDefaultnumber() {
return defaultnumber;
}
public void setDefaultnumber(String defaultnumber) {
this.defaultnumber = defaultnumber;
}
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getOperpersonname() {
return operpersonname;
}
public void setOperpersonname(String operpersonname) {
this.operpersonname = operpersonname;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Date getOpertime() {
return opertime;
}
public void setOpertime(Date opertime) {
this.opertime = opertime;
}
public Long getOrganid() {
return organid;
}
public void setOrganid(Long organid) {
this.organid = organid;
}
public Long getHandspersonid() {
return handspersonid;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public BigDecimal getChangeamount() {
return changeamount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
public Long getAllocationprojectid() {
return allocationprojectid;
}
public void setAllocationprojectid(Long allocationprojectid) {
this.allocationprojectid = allocationprojectid;
}
public BigDecimal getTotalprice() {
return totalprice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
public String getPaytype() {
return paytype;
}
public void setPaytype(String paytype) {
this.paytype = paytype;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getSalesman() {
return salesman;
}
public void setSalesman(String salesman) {
this.salesman = salesman;
}
public String getAccountidlist() {
return accountidlist;
}
public void setAccountidlist(String accountidlist) {
this.accountidlist = accountidlist;
}
public String getAccountmoneylist() {
return accountmoneylist;
}
public void setAccountmoneylist(String accountmoneylist) {
this.accountmoneylist = accountmoneylist;
}
public BigDecimal getDiscount() {
return discount;
}
public void setDiscount(BigDecimal discount) {
this.discount = discount;
}
public BigDecimal getDiscountmoney() {
return discountmoney;
}
public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney;
}
public BigDecimal getDiscountlastmoney() {
return discountlastmoney;
}
public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney;
}
public BigDecimal getOthermoney() {
return othermoney;
}
public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney;
}
public String getOthermoneylist() {
return othermoneylist;
}
public void setOthermoneylist(String othermoneylist) {
this.othermoneylist = othermoneylist;
}
public String getOthermoneyitem() {
return othermoneyitem;
}
public void setOthermoneyitem(String othermoneyitem) {
this.othermoneyitem = othermoneyitem;
}
public Integer getAccountday() {
return accountday;
}
public void setAccountday(Integer accountday) {
this.accountday = accountday;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getLinknumber() {
return linknumber;
}
public void setLinknumber(String linknumber) {
this.linknumber = linknumber;
}
public String getProjectName() {
return projectName;
}

View File

@@ -19,6 +19,8 @@ public class DepotHeadVo4StatementAccount {
private String oTime;
private Long tenantId;
public String getNumber() {
return number;
}
@@ -74,4 +76,12 @@ public class DepotHeadVo4StatementAccount {
public void setoTime(String oTime) {
this.oTime = oTime;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

View File

@@ -1,91 +1,11 @@
package com.jsh.erp.datasource.vo;
import java.util.Date;
import com.jsh.erp.datasource.entities.Log;
public class LogVo4List {
private Long id;
private Long userid;
private String operation;
private String clientip;
private Date createtime;
private Byte status;
private String contentdetails;
private String remark;
public class LogVo4List extends Log {
private String username;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getUserid() {
return userid;
}
public void setUserid(Long userid) {
this.userid = userid;
}
public String getOperation() {
return operation;
}
public void setOperation(String operation) {
this.operation = operation;
}
public String getClientip() {
return clientip;
}
public void setClientip(String clientip) {
this.clientip = clientip;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Byte getStatus() {
return status;
}
public void setStatus(Byte status) {
this.status = status;
}
public String getContentdetails() {
return contentdetails;
}
public void setContentdetails(String contentdetails) {
this.contentdetails = contentdetails;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getUsername() {
return username;
}