From 3473e4661b0ad1fffd01088343fcd2dd3b4fc82f Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 27 Sep 2024 17:42:52 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleBillController.java | 24 +++- .../emis/domain/stat/OpenBillStatInfo.java | 44 ++++++ .../erp/emis/mapper/EmisSettleBillMapper.java | 4 + .../emis/service/IEmisSettleBillService.java | 10 +- .../impl/EmisSettleBillServiceImpl.java | 15 ++- .../resources/mapper/EmisSettleBillMapper.xml | 126 +++++++++++++++++- 6 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/OpenBillStatInfo.java diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index ef163a3c8..da2365402 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -37,6 +37,7 @@ import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.EmisSettleSubBillFeeitem; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; +import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanResult; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.IEmisExchangeRateService; @@ -93,8 +94,11 @@ public class EmisSettleBillController extends BaseController @Autowired private IEmisExchangeRateService emisExchangeRateService; - - + /** + * 回款统计 + * @param emisSettleBill + * @return + */ @GetMapping("/queryBillPayStatInfoList") public TableDataInfo queryBillPayStatInfoList(EmisSettleBill emisSettleBill) { @@ -106,6 +110,22 @@ public class EmisSettleBillController extends BaseController return getDataTable(list); } + /** + * 开票统计 + * @param emisSettleBill + * @return + */ + @GetMapping("/queryOpenBillStatInfoList") + public TableDataInfo queryOpenBillStatInfoList(EmisSettleBill emisSettleBill) + { + startPage(); + + setPrivParams(emisSettleBill); + + List list = emisSettleBillService.selectOpenBillStatInfoList(emisSettleBill); + return getDataTable(list); + } + /** * 查询结算总账单列表 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/OpenBillStatInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/OpenBillStatInfo.java new file mode 100644 index 000000000..3de7c9339 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/OpenBillStatInfo.java @@ -0,0 +1,44 @@ +package com.xdadan.erp.emis.domain.stat; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 账单开票统计明细 + */ +@Data +public class OpenBillStatInfo implements Serializable { + private static final long serialVersionUID = 1L; + + // 销售联系人 + private String salesmen; + + private String billMonth; + + // 账单总数量 + private Integer totalBillCount; + // 已开票账单数量 + private Integer hasOpenBillCount; + // 部分开票账单数量 + private Integer someOpenBillCount; + // 未开票账单数量 + private Integer noOpenBillCount; + + // 不开票账单数量 + private Integer noNeedOpenBillCount; + // 正常开票数量 + private Integer normalOpenBillCount; + // 超时开票数量 + private Integer expiredOpenBillCount; + // 超时未开票账单数量 + private Integer expiredNoOpenBillCount; + + // 正常开票率 + private BigDecimal normalOpenBillRate; + // 超期开票率 + private BigDecimal expireOpenBillRate; + + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java index ee299a607..e0337375c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java @@ -16,6 +16,7 @@ import com.xdadan.erp.common.annotation.audit.DataAuditLog; import com.xdadan.erp.common.annotation.audit.OperateType; import com.xdadan.erp.emis.domain.EmisSettleBill; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; +import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; import com.xdadan.erp.emis.service.impl.EmisSettleBillServiceImpl; import com.xdadan.erp.emis.service.impl.EmisSettleSubBillServiceImpl; @@ -45,6 +46,9 @@ public interface EmisSettleBillMapper extends BaseMapper */ public List selectBillPayStatInfoList(EmisSettleBill emisSettleBill); + + public List selectOpenBillStatInfoList(EmisSettleBill emisSettleBill); + /** * 查询列表 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java index e30f6fc44..00e08abec 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java @@ -15,6 +15,7 @@ import com.xdadan.erp.common.core.audit.IDataAuditService; import com.xdadan.erp.emis.domain.EmisSettleBill; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; +import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; /** * @ClassName EmisSettleBillService @@ -36,12 +37,19 @@ public interface IEmisSettleBillService extends IDataAuditService /** - * 获取统计数据 + * 获取收款统计数据 * @param emisSettleBill * @return */ public List selectBillPayStatInfoList(EmisSettleBill emisSettleBill); + /** + * 获取开票统计数据 + * @param emisSettleBill + * @return + */ + public List selectOpenBillStatInfoList(EmisSettleBill emisSettleBill); + /** * 查询结算总账单列表 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 603f6903f..e5db50236 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -26,6 +26,7 @@ import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; +import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.utils.WaybillHelper; @@ -75,7 +76,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS /** - * 获取统计数据 + * 获取回款统计数据 * @param emisSettleBill * @return */ @@ -85,6 +86,18 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS return emisSettleBillMapper.selectBillPayStatInfoList(emisSettleBill); } + /** + * 获取开票统计数据 + * @param emisSettleBill + * @return + */ + @Override + public List selectOpenBillStatInfoList(EmisSettleBill emisSettleBill) + { + return emisSettleBillMapper.selectOpenBillStatInfoList(emisSettleBill); + } + + @Override public EmisSettleBill selectEmisSettleBillBySettleBillNo(String settleBillNo) { diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index b0eb80130..f4b1994c7 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -83,6 +83,22 @@ + + + + + + + + + + + + + + + + @@ -102,7 +118,7 @@ from ( select salesmen,bill_month as billMonth, ROUND(sum(rec_money),2) as recPayMoney, - ROUND(sum(send_piece_sum),0) as totalBillCount, + count(1) as totalBillCount, ROUND(sum(reced_money),2) as hasRecdPayMoney from emis_settle_bill a @@ -195,6 +211,114 @@ + + + select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, invoiced_money, cust_no, cust_name, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, payee, salesmen, credit_period, credit_period_type, settle_day, payment_due_date, bl_send_oms, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_bill a