aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-18 00:07:08 +08:00
parent 36063058fe
commit 0dd20ccf64
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/BillPayStatInfo.java
View File

@ -22,6 +22,12 @@ public class BillPayStatInfo implements Serializable {
// 总已收金额/总未收金额
private BigDecimal totalRecdPayMoney;
private BigDecimal totalNoRecdPayMoney;
private BigDecimal totalSatisfyMoney;
private BigDecimal totalAllowanceMoney;
private BigDecimal totalDeductionMoney;
private BigDecimal totalOtherMoney;
// 账单总数量
private Integer totalBillCount;
// 已收款账单数量

21
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -74,12 +74,18 @@
<result property="totalRecdPayMoney" column="totalRecdPayMoney" />
<result property="totalNoRecdPayMoney" column="totalNoRecdPayMoney" />
<result property="totalSatisfyMoney" column="totalSatisfyMoney" />
<result property="totalAllowanceMoney" column="totalAllowanceMoney" />
<result property="totalDeductionMoney" column="totalDeductionMoney" />
<result property="totalOtherMoney" column="totalOtherMoney" />
<result property="totalBillCount" column="totalBillCount" />
<result property="hasPayBillCount" column="hasPayBillCount" />
<result property="somePayBillCount" column="somePayBillCount" />
<result property="noPayBillCount" column="noPayBillCount" />
<result property="recdPayMoney" column="recdPayMoney" />
<result property="noRecdPayMoney" column="noRecdPayMoney" />
<result property="expiredRecdPayMoney" column="expiredRecdPayMoney" />
<result property="expiredNoRecdPayMoney" column="expiredNoRecdPayMoney" />
<result property="billPayRate" column="billPayRate" />
@ -112,6 +118,13 @@
tba.totalBillCount,
tba.totalRecdPayMoney,
tba.totalNoRecdPayMoney,
tba.totalSatisfyMoney,
tba.totalAllowanceMoney,
tba.totalDeductionMoney,
tba.totalOtherMoney,
tbb.hasPayBillCount,
tbb.somePayBillCount,
tbb.noPayBillCount,
@ -124,8 +137,12 @@
ROUND(sum(rec_money),2) as recPayMoney,
count(1) as totalBillCount,
ROUND(sum(reced_money),2) as totalRecdPayMoney,
ROUND(sum(rec_money-reced_money),2) as totalNoRecdPayMoney
from emis_settle_bill a
ROUND(sum(rec_money-reced_money-satisfy_money-allowance_money-deduction_money-other_money),2) as totalNoRecdPayMoney,
ROUND(sum(satisfy_money),2) as totalSatisfyMoney,
ROUND(sum(allowance_money),2) as totalAllowanceMoney,
ROUND(sum(deduction_money-other_money),2) as totalDeductionMoney,
ROUND(sum(other_money),2) as totalOtherMoney
from emis_settle_bill a
<where>
a.del_flag='0'
<if test="salesmen != null and salesmen!='' "> and a.salesmen = #{salesmen}</if>