purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化财务单据

Browse Source
This commit is contained in:
季圣华
2021-07-01 00:53:46 +08:00
parent c5b7a44740
commit 16b5194842
8 changed files with 196 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountHead.java
View File

@@ -16,6 +16,8 @@ public class AccountHead {
private BigDecimal changeAmount;
private BigDecimal discountMoney;
private BigDecimal totalPrice;
private Long accountId;
@@ -80,6 +82,14 @@ public class AccountHead {
this.changeAmount = changeAmount;
}
public BigDecimal getDiscountMoney() {
return discountMoney;
}
public void setDiscountMoney(BigDecimal discountMoney) {
this.discountMoney = discountMoney;
}
public BigDecimal getTotalPrice() {
return totalPrice;
}

60
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java
View File

@@ -476,6 +476,66 @@ public class AccountHeadExample {
return (Criteria) this;
}
public Criteria andDiscountMoneyIsNull() {
addCriterion("discount_money is null");
return (Criteria) this;
}
public Criteria andDiscountMoneyIsNotNull() {
addCriterion("discount_money is not null");
return (Criteria) this;
}
public Criteria andDiscountMoneyEqualTo(BigDecimal value) {
addCriterion("discount_money =", value, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyNotEqualTo(BigDecimal value) {
addCriterion("discount_money <>", value, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyGreaterThan(BigDecimal value) {
addCriterion("discount_money >", value, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("discount_money >=", value, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyLessThan(BigDecimal value) {
addCriterion("discount_money <", value, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyLessThanOrEqualTo(BigDecimal value) {
addCriterion("discount_money <=", value, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyIn(List<BigDecimal> values) {
addCriterion("discount_money in", values, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyNotIn(List<BigDecimal> values) {
addCriterion("discount_money not in", values, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("discount_money between", value1, value2, "discountMoney");
return (Criteria) this;
}
public Criteria andDiscountMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("discount_money not between", value1, value2, "discountMoney");
return (Criteria) this;
}
public Criteria andTotalPriceIsNull() {
addCriterion("total_price is null");
return (Criteria) this;

142
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
View File

@@ -3,150 +3,18 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class AccountHeadVo4ListEx {
private Long id;
private String type;
private Long organId;
private Long handsPersonId;
private BigDecimal changeAmount;
private BigDecimal totalPrice;
private Long accountId;
private String billNo;
private Date billTime;
private String remark;
private String fileName;
private Long tenantId;
private String deleteFlag;
public class AccountHeadVo4ListEx extends AccountHead{
private String organName;
private String handsPersonName;
private Long creator;
private String userName;
private String accountName;
private String billTimeStr;
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 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 BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getTotalPrice() {
return totalPrice;
}
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getBillNo() {
return billNo;
}
public void setBillNo(String billNo) {
this.billNo = billNo;
}
public Date getBillTime() {
return billTime;
}
public void setBillTime(Date billTime) {
this.billTime = billTime;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
public String getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag;
}
public String getOrganName() {
return organName;
}
@@ -163,14 +31,6 @@ public class AccountHeadVo4ListEx {
this.handsPersonName = handsPersonName;
}
public Long getCreator() {
return creator;
}
public void setCreator(Long creator) {
this.creator = creator;
}
public String getUserName() {
return userName;
}