From cd6699c9b192e1e9d485b87f7f86f5c28e6b6b2d Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 15:36:02 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/EmisSettlePayRecordController.java | 67 +++++++++++++------ .../service/IEmisSettlePayRecordService.java | 21 ++++-- .../impl/EmisSettlePayRecordServiceImpl.java | 55 +++++++++------ 3 files changed, 92 insertions(+), 51 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java index 9de42f29a..a44fc9ac3 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java @@ -11,37 +11,28 @@ package com.xdadan.erp.web.emis; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; - import cn.hutool.core.map.MapUtil; -import com.xdadan.erp.emis.domain.exception.EmisBizError; -import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; -import com.xdadan.erp.emis.utils.WaybillHelper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.xdadan.erp.common.annotation.Log; 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.poi.ExcelUtil; - import com.xdadan.erp.emis.domain.EmisSettlePayRecord; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; +import com.xdadan.erp.emis.utils.WaybillHelper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * 账单收退款记录Controller @@ -89,6 +80,38 @@ public class EmisSettlePayRecordController extends BaseController return getDataTable(list); } + /** + * 查询账单收退款记录列表 + */ + @GetMapping("/listSimple") + public TableDataInfo listSimple(EmisSettlePayRecord emisSettlePayRecord) + { + startPage(); + + setPrivParams(emisSettlePayRecord); + + String billCodeStr = MapUtil.getStr(emisSettlePayRecord.getParams(),"billCode"); + if(!StringUtils.isEmpty(billCodeStr)){ + emisSettlePayRecord.getParams().put("billCode", WaybillHelper.formatQueryValue(billCodeStr)); + String[] billCodeSortList = billCodeStr.split(","); + if(billCodeSortList.length>1){ + emisSettlePayRecord.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + } + + + if(!StringUtils.isEmpty(emisSettlePayRecord.getSettleBillNo())){ + emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo())); + String[] settleBillNoSortList = emisSettlePayRecord.getSettleBillNo().split(","); + if(settleBillNoSortList.length>1){ + emisSettlePayRecord.getParams().put("settleBillNoSortList",Arrays.asList(settleBillNoSortList)); + } + } + + List list = emisSettlePayRecordService.selectEmisSettlePayRecordListSimple(emisSettlePayRecord); + return getDataTable(list); + } + /** * 收款统计Map */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java index c20bcfb6c..4cb6c6454 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java @@ -9,14 +9,13 @@ */ package com.xdadan.erp.emis.service; -import java.util.List; -import java.util.Map; + import com.xdadan.erp.emis.domain.EmisSettlePayRecord; + import com.xdadan.erp.emis.domain.exception.EmisBizError; + import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; -import javax.servlet.http.HttpServletResponse; - -import com.xdadan.erp.emis.domain.EmisSettlePayRecord; -import com.xdadan.erp.emis.domain.exception.EmisBizError; -import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; + import javax.servlet.http.HttpServletResponse; + import java.util.List; + import java.util.Map; /** * @ClassName EmisSettlePayRecordService @@ -41,6 +40,14 @@ public interface IEmisSettlePayRecordService */ public List selectEmisSettlePayRecordList(EmisSettlePayRecord emisSettlePayRecord); + /** + * 查询账单收退款记录列表 + * + * @param emisSettlePayRecord 账单收退款记录 + * @return 账单收退款记录集合 + */ + public List selectEmisSettlePayRecordListSimple(EmisSettlePayRecord emisSettlePayRecord); + public Map getSettlePayStatInfoMap(EmisSettlePayRecord emisSettlePayRecord); public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index ecaf16986..dd36bf473 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -10,6 +10,24 @@ package com.xdadan.erp.emis.service.impl; +import com.xdadan.erp.emis.domain.*; +import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; +import com.xdadan.erp.emis.mapper.*; +import com.xdadan.erp.emis.service.EmisBaseService; +import com.xdadan.erp.emis.service.IEmisSettleBillService; +import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; +import com.xdadan.erp.emis.service.excelCellStrategy.EmisSettlePayRecordCustomExcelUtil; +import com.xdadan.erp.emis.utils.WaybillHelper; +import jodd.util.StringUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.time.LocalDate; import java.time.ZoneId; @@ -22,25 +40,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; - -import com.xdadan.erp.emis.domain.*; -import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; -import com.xdadan.erp.emis.domain.exception.EmisBizError; -import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; -import com.xdadan.erp.emis.mapper.*; -import com.xdadan.erp.emis.service.EmisBaseService; -import com.xdadan.erp.emis.service.IEmisSettleBillService; -import com.xdadan.erp.emis.service.excelCellStrategy.EmisSettlePayRecordCustomExcelUtil; -import com.xdadan.erp.emis.utils.WaybillHelper; -import jodd.util.StringUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; - /** * 账单收退款记录Service业务层处理 * @@ -92,6 +91,18 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I return emisSettlePayRecordMapper.selectEmisSettlePayRecordById(id); } + /** + * 查询账单收退款记录列表 + * + * @param emisSettlePayRecord 账单收退款记录 + * @return 账单收退款记录 + */ + @Override + public List selectEmisSettlePayRecordListSimple(EmisSettlePayRecord emisSettlePayRecord) + { + return emisSettlePayRecordMapper.selectEmisSettlePayRecordList(emisSettlePayRecord); + } + /** * 查询账单收退款记录列表（带扩展信息） * @@ -118,7 +129,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I .map(EmisSettlePayRecord::getPayId) .filter(StringUtils::isNotBlank) .distinct() - .collect(java.util.stream.Collectors.toList()); + .collect(Collectors.toList()); if (CollectionUtils.isEmpty(payIds)) { return baseList; @@ -365,7 +376,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I // 对于没有开票状态记录的payId，需要检查emis_settle_bill的open_bill_status List missingPayIds = payIds.stream() .filter(payId -> !result.containsKey(payId)) - .collect(java.util.stream.Collectors.toList()); + .collect(Collectors.toList()); if (!CollectionUtils.isEmpty(missingPayIds)) { List> billStatusList = emisSettlePayRecordMapper @@ -621,7 +632,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I if (StringUtils.isNotBlank(payRecordOld.getSettleBillNo())) { List settleBillNos = Arrays.stream(payRecordOld.getSettleBillNo().split(",")) .map(String::trim) - .filter(org.apache.commons.lang3.StringUtils::isNotBlank) + .filter(StringUtils::isNotBlank) .distinct() .collect(Collectors.toList()); for (String settleBillNo : settleBillNos) {