From 8fa484ddfa009c496a84971aa93564a69f12d182 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 8 Jul 2024 14:32:35 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleSubBillController.java | 45 ++++++++++++++++++- .../erp/emis/domain/EmisSettleSubBill.java | 4 +- .../emis/mapper/EmisSettleSubBillMapper.java | 13 +++++- .../service/IEmisSettleSubBillService.java | 16 ++++++- .../impl/EmisSettleSubBillServiceImpl.java | 17 +++++++ .../mapper/EmisSettleSubBillFeeitemMapper.xml | 11 ++++- .../mapper/EmisSettleSubBillMapper.xml | 8 ++++ 7 files changed, 107 insertions(+), 7 deletions(-) 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 cac829014..8d3f8fbc2 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 @@ -11,13 +11,18 @@ package com.xdadan.erp.web.emis; +import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge; +import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.EmisWaybillAjustApply; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.service.EmisBaseService; +import com.xdadan.erp.emis.utils.WaybillHelper; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -34,7 +39,6 @@ import com.xdadan.erp.common.core.controller.BaseController; import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.common.utils.StringUtils; import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.emis.domain.EmisSettleSubBill; @@ -48,7 +52,7 @@ import com.xdadan.erp.emis.service.IEmisSettleSubBillService; */ @RestController @RequestMapping("/emis/emisSettleSubBill") -public class EmisSettleSubBillController extends BaseController +public class EmisSettleSubBillController extends EmisBaseController { @Autowired private IEmisSettleSubBillService emisSettleSubBillService; @@ -65,10 +69,47 @@ public class EmisSettleSubBillController extends BaseController public TableDataInfo list(EmisSettleSubBill emisSettleSubBill) { startPage(); + + + setPrivParams(emisSettleSubBill); + + if(!org.apache.commons.lang3.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.selectEmisSettleSubBillList(emisSettleSubBill); return getDataTable(list); } + /** + * 查询统计信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')") + @GetMapping("/getQueryStatInfoMap") + public AjaxResult getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill) + { + + + setPrivParams(emisSettleSubBill); + + if(!org.apache.commons.lang3.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)); + } + } + + + + Map rstMap = emisSettleSubBillService.getQueryStatInfoMap(emisSettleSubBill); + return AjaxResult.success("查询成功",rstMap); + } + /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java index c86501be9..cc987951a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java @@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -84,6 +86,6 @@ public class EmisSettleSubBill extends BaseEntity // 扩展参数 private EmisWaybill waybillDetail; - + private List feeitemList; } 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 574c833b4..ed145fce0 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 @@ -11,8 +11,12 @@ package com.xdadan.erp.emis.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisSettleSubBill; +import com.xdadan.erp.emis.domain.EmisWaybill; + /** * @ClassName EmisSettleSubBillMapper * @Description

结算子账单 Mapper 接口

@@ -39,8 +43,15 @@ public interface EmisSettleSubBillMapper extends BaseMapper */ public List selectEmisSettleSubBillList(EmisSettleSubBill emisSettleSubBill); + /** + * 统计数据 + * @param emisSettleSubBill + * @return + */ + public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill); - /** + + /** * 检查是否重复 * * @param 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 73b9bd8a8..524cc595d 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 @@ -10,9 +10,12 @@ package com.xdadan.erp.emis.service; import java.util.List; -import com.xdadan.erp.emis.domain.EmisSettleSubBill; +import java.util.Map; -/** +import com.xdadan.erp.emis.domain.EmisSettleSubBill; +import com.xdadan.erp.emis.domain.EmisWaybill; + + /** * @ClassName EmisSettleSubBillService * @Description 结算子账单 * @author linfso @@ -37,6 +40,15 @@ public interface IEmisSettleSubBillService /** + * 查询统计信息 + * @param emisSettleSubBill + * @return + */ + public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill); + + + + /** * 检查是否重复 * * @param 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 00e3b28d3..109492237 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 @@ -11,6 +11,9 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; +import java.util.Map; + +import com.xdadan.erp.emis.domain.EmisWaybill; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisSettleSubBill; @@ -54,6 +57,20 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService return emisSettleSubBillMapper.selectEmisSettleSubBillList(emisSettleSubBill); } + /** + * 获取查询统计信息 + * + * @param emisSettleSubBill + * @return 获取查询统计信息Map + */ + @Override + public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill) + { + Map statInfoMap=emisSettleSubBillMapper.getQueryStatInfoMap(emisSettleSubBill); + + return statInfoMap; + } + /** * 检查是否重复 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml index d9fc92094..d355907a5 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml @@ -20,6 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, sub_bill_no, bill_code, fee_code, fee_name, bill_fee, orig_fee, currency, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_settle_sub_bill_feeitem + + + - + + +