From 00b49924be9fc8b310d3dce26563dad33461f0e2 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 25 Jan 2026 17:34:31 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8825=E6=97=A5=EF=BC=8C=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E5=AF=BC=E5=87=BA=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/Util/ExcelHeaderTranslator.java | 8 ++--- .../example/demo/domain/vo/cash/CashRecordDTO.java | 11 +++--- .../serviceImpl/coin/ExportExcelServiceImpl.java | 40 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 565eba1..d77697f 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -298,8 +298,8 @@ public class ExcelHeaderTranslator { headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); - headers.put("market", "所属地区"); - headers.put("status", "订单状态"); + headers.put("marketName", "所属地区"); + headers.put("statusDesc", "订单状态"); headers.put("remark", "备注"); headers.put("refundReason", "退款理由"); headers.put("refundModelDesc", "退款方式"); @@ -317,8 +317,8 @@ public class ExcelHeaderTranslator { */ public List getCashRecordColumnOrder() { return Arrays.asList( - "goodsName", "goodsNum", "numUnit", "permanentGold", "freeGold", "Submitter", "id", "jwcode", "name", "market", - "status", "remark", "refundReason", "refundModelDesc" + "goodsName", "goodsNum", "numUnit", "permanentGold", "freeGold", "Submitter", "id", "jwcode", "name", "marketName", + "statusDesc", "remark", "refundReason", "refundModelDesc" ); } diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index f56e414..94c8f5a 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java @@ -1,9 +1,6 @@ package com.example.demo.domain.vo.cash; import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.example.demo.config.MarketConverter; -import com.example.demo.config.OrderStatusConverter; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; @@ -98,8 +95,9 @@ public class CashRecordDTO{ /** * 所属地区 */ - @ExcelProperty(value = "",converter = MarketConverter.class) + @ExcelIgnore private Integer market; + private String marketName; /** * 金币订单号 @@ -131,8 +129,9 @@ public class CashRecordDTO{ 30：总部财务待审核；32：总部财务驳回； 40：执行人待处理；41：执行人已处理，退款结束 */ - @ExcelProperty(value="",converter = OrderStatusConverter.class) + @ExcelIgnore private Integer status; + private String statusDesc; /** * 提交人id @@ -257,8 +256,6 @@ public class CashRecordDTO{ @ExcelIgnore private String executorName; @ExcelIgnore - private String marketName; - @ExcelIgnore private List statuses; @ExcelIgnore private String processInstanceId; // 流程实例ID diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index dd4344a..18260f1 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -1337,6 +1337,34 @@ public class ExportExcelServiceImpl implements ExportExcelService { default: return "其他"; } } + + /** + * 根据状态值获取状态描述 + */ + private String getStatusDescription(Integer status) { + if (status == null) return ""; + + switch (status) { + case 0: return "线下财务待审核"; + case 1: return "线下财务审核通过待填手续费"; + case 2: return "线下财务审核驳回"; + case 3: return "link线上财务复核待填手续费"; + case 4: return "收款流程全部结束"; + case 5: return "手动撤回待编辑提交"; + case 6: return "退款"; + case 10: return "地区财务待审核"; + case 11: return "地区财务手动撤回待编辑提交"; + case 12: return "地区财务驳回"; + case 20: return "地区负责人待审核"; + case 22: return "地区负责人驳回"; + case 30: return "总部财务待审核"; + case 32: return "总部财务驳回"; + case 40: return "执行人待处理"; + case 41: return "执行人已处理，退款结束"; + default: return "未知状态（" + status + "）"; + } + } + // 各种实体类的翻译方法 /** @@ -1636,6 +1664,18 @@ public class ExportExcelServiceImpl implements ExportExcelService { if (item.getRefundModelDesc() != null && !item.getRefundModelDesc().isEmpty()) { item.setRefundModelDesc(languageTranslationUtil.translate(item.getRefundModelDesc(), lang)); } + + // 翻译所属地区名称 + if (item.getMarketName() != null && !item.getMarketName().isEmpty()) { + item.setMarketName(languageTranslationUtil.translate(item.getMarketName(), lang)); + } + + // 翻译订单状态（首先获取状态的中文描述，然后进行多语言翻译） + if (item.getStatus() != null) { + String statusDesc = getStatusDescription(item.getStatus()); + String translatedStatus = languageTranslationUtil.translate(statusDesc, lang); + item.setStatusDesc(translatedStatus); // 假设有状态描述字段 + } } }