From ca788ede307e3f9771bec6c7552c760e64143461 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 11 Jul 2024 09:56:46 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleSubBillController.java | 29 +++- .../emis/mapper/EmisSettleSubBillMapper.java | 5 + .../service/IEmisSettleSubBillService.java | 7 + .../impl/EmisSettleSubBillServiceImpl.java | 12 ++ .../mapper/EmisSettleSubBillMapper.xml | 134 ++++++++++++++++++ 5 files changed, 186 insertions(+), 1 deletion(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index fe7f4d80b..683b5db10 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -111,7 +111,34 @@ public class EmisSettleSubBillController extends EmisBaseController } - /** + /** + * 根据月结客户统计月结账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')") + @GetMapping("/getMonthBillStatInfoMapList") + public TableDataInfo getMonthBillStatInfoMapList(EmisSettleSubBill emisSettleSubBill) + { + + startPage(); + + setPrivParams(emisSettleSubBill); + + if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ + emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode())); + String[] billCodeSortList = emisSettleSubBill.getBillCode().split(","); + if(billCodeSortList.length>1){ + emisSettleSubBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + } + + + List list = emisSettleSubBillService.getMonthBillStatInfoMapList(emisSettleSubBill); + return getDataTable(list); + + } + + + /** * 检查是否重复 * * @param emisSettleSubBill diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java index 8828296c7..d395e52a7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java @@ -55,6 +55,11 @@ public interface EmisSettleSubBillMapper extends BaseMapper public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill); + /** + * 根据客户统计月结账单 + */ + public List getMonthBillStatInfoMapList(EmisSettleSubBill emisSettleSubBill); + /** * 检查是否重复 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java index 524cc595d..fa055ea6c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java @@ -47,6 +47,13 @@ public interface IEmisSettleSubBillService public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill); + /** + * 根据月结客户统计月结账单 + * @param emisSettleSubBill + * @return + */ + public List getMonthBillStatInfoMapList(EmisSettleSubBill emisSettleSubBill); + /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java index 109492237..ebbce553b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java @@ -71,6 +71,18 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService return statInfoMap; } + /** + * 根据月结客户统计月结账单 + * + * @param emisSettleSubBill + * @return 获取查询统计信息Map + */ + @Override + public List getMonthBillStatInfoMapList(EmisSettleSubBill emisSettleSubBill) + { + return emisSettleSubBillMapper.getMonthBillStatInfoMapList(emisSettleSubBill); + } + /** * 检查是否重复 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index a5a8bec4b..b38f695f5 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -312,6 +312,140 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +