From 1ebd9cea070d23938101500454f1f16c5f1f29e5 Mon Sep 17 00:00:00 2001 From: aikai Date: Fri, 11 Jul 2025 15:45:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(bpm):=20=E4=BC=98=E5=8C=96=E5=BC=80?= =?UTF-8?q?=E6=94=AF=E6=97=A5=E6=8A=A5=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改导出文件名称为"开支日报申请.xls" - 优化 BpmOAExpensesExportVO 结构，移除未使用的字段 -重构 BpmOAExpensesServiceImpl 中的导出逻辑，提高代码可读性和性能 --- .../admin/oa/BpmOAExpensesController.java | 4 ++-- .../oa/vo/expenses/BpmOAExpensesExportVO.java | 18 +++--------------- .../service/oa/BpmOAExpensesServiceImpl.java | 17 ++++++++--------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java index 0b45f5dc..7fd96816 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java @@ -115,7 +115,7 @@ public class BpmOAExpensesController { } @GetMapping("/export-excel") - @Operation(summary = "导出生产开支申请 Excel") + @Operation(summary = "导出开支日报申请 Excel") @DataPermission(enable = false) @OperateLog(type = EXPORT) public void exportExpensesExcel(@Valid BpmOAExpensesPageReqVO pageReqVO, @@ -125,7 +125,7 @@ public class BpmOAExpensesController { //转换 List list = expensesService.convertExpensesList(pageResult.getList()); // 导出 Excel - ExcelUtils.write(response, "生产开支申请.xls", "数据", BpmOAExpensesExportVO.class, list); + ExcelUtils.write(response, "开支日报申请.xls", "数据", BpmOAExpensesExportVO.class, list); } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesExportVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesExportVO.java index 0d04d74f..15989db8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesExportVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesExportVO.java @@ -24,16 +24,10 @@ public class BpmOAExpensesExportVO { @ExcelProperty("申请用户") private String userName; - // @ExcelProperty("费用类型") - private Integer type; - - // @ExcelProperty("费用板块") - private Integer costSection; - - @ExcelProperty("费用类型 bpm_oa_expenses_type") + @ExcelProperty("费用类型") private String typeName; - @ExcelProperty("费用板块 费用板块 | 1叉车 2打包 3搬运 4运输") + @ExcelProperty("费用板块") private String costSectionName; @ExcelProperty("费用产生部门") @@ -57,13 +51,7 @@ public class BpmOAExpensesExportVO { @ExcelProperty("银行卡号") private String bankNo; - // @ExcelProperty("审批时间") - private String endTime; - - // @ExcelProperty("支付状态") - private Integer status; - - @ExcelProperty("支付状态 | 0未支付 1已支付") + @ExcelProperty("支付状态") private String statusName; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java index 0568b1d9..23db5fe1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java @@ -43,10 +43,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -340,12 +337,14 @@ public class BpmOAExpensesServiceImpl extends BpmOABaseService implements BpmOAE costSectionMap.put(4, "运输"); List bpmOaExpensesType = dictDataApi.getDictDataList("bpm_oa_expenses_type").getCheckedData(); Map typeMap = bpmOaExpensesType.stream().collect(Collectors.toMap(DictDataRespDTO::getValue, DictDataRespDTO::getLabel)); - List vos = BeanUtil.copyToList(list, BpmOAExpensesExportVO.class); - for (BpmOAExpensesExportVO vo : vos) { - vo.setTypeName(typeMap.get(String.valueOf(vo.getType()))); - vo.setStatusName(vo.getStatus() == 0 ? "未支付" : "已支付"); + List vos = new ArrayList<>(); + for (BpmOAExpensesPageRespVO bpmOAExpensesPageRespVO : list) { + BpmOAExpensesExportVO vo = BeanUtil.copyProperties(bpmOAExpensesPageRespVO, BpmOAExpensesExportVO.class); + vo.setTypeName(typeMap.get(String.valueOf(bpmOAExpensesPageRespVO.getType()))); + vo.setStatusName(bpmOAExpensesPageRespVO.getStatus() == 0 ? "未支付" : "已支付"); // 费用板块 费用板块 | 1叉车 2打包 3搬运 4运输 - vo.setCostSectionName(costSectionMap.get(vo.getCostSection())); + vo.setCostSectionName(costSectionMap.get(bpmOAExpensesPageRespVO.getCostSection())); + vos.add(vo); } return vos; }