From 440fcbf1edb7ca4e122e1bb205ba25b5d9c6b879 Mon Sep 17 00:00:00 2001 From: Yangk Date: Mon, 8 Dec 2025 10:56:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(erp/afterSales):=E4=BF=AE=E5=A4=8D=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=20500=20=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=8F=8A=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/erp/domain/vo/ErpAfterSalesVo.java | 99 +++++++------------ 1 file changed, 35 insertions(+), 64 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java index f738b254..d81a9c2a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java @@ -1,7 +1,11 @@ package org.dromara.oa.erp.domain.vo; +import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; +import java.io.Serial; +import java.io.Serializable; + import org.dromara.oa.erp.domain.ErpAfterSales; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -9,14 +13,6 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.oa.erp.domain.vo.ErpAfterSalesLaborCostsVo; -import org.dromara.oa.erp.domain.vo.ErpAfterSalesMaterialCostsVo; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - /** * 项目售后信息视图对象 erp_after_sales @@ -35,7 +31,6 @@ public class ErpAfterSalesVo implements Serializable { /** * 售后ID */ - @ExcelProperty(value = "售后ID") private Long afterSalesId; /** @@ -51,35 +46,22 @@ public class ErpAfterSalesVo implements Serializable { private String afterSalesSubject; /** - * 项目ID - */ - @ExcelProperty(value = "项目ID") - private Long projectId; - - /** - * 项目编号 - */ - @ExcelProperty(value = "项目编号") - private String projectCode; - - /** - * 项目名称 + * 项目名称 (直接导出名字) */ @ExcelProperty(value = "项目名称") private String projectName; - /** - * 客户ID - */ - @ExcelProperty(value = "客户ID") - private Long customerId; + private Long projectId; + private String projectCode; /** - * 客户名称 + * 客户名称 (直接导出名字) */ @ExcelProperty(value = "客户名称") private String customerName; + private Long customerId; + /** * 联系人 */ @@ -99,17 +81,13 @@ public class ErpAfterSalesVo implements Serializable { private Date afterSalesDate; /** - * 合同ID - */ - @ExcelProperty(value = "合同ID") - private Long contractId; - - /** - * 合同号 + * 合同号 (直接导出) */ @ExcelProperty(value = "合同号") private String contractCode; + private Long contractId; + /** * 售后类型 */ @@ -118,19 +96,27 @@ public class ErpAfterSalesVo implements Serializable { private String afterSalesType; /** - * 客户干系人ID（关联客户联系人表） + * 客户干系人ID */ - @ExcelProperty(value = "客户干系人ID", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "关=联客户联系人表") private String stakeholderId; /** - * 处理人ID（关联用户表） + * 客户干系人 (中文名) + */ + @ExcelProperty(value = "客户干系人") + private String stakeholderName; + + /** + * 处理人ID */ - @ExcelProperty(value = "处理人ID", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "关=联用户表") private String handlerId; + /** + * 处理人 (中文名) + */ + @ExcelProperty(value = "处理人") + private String handlerName; + /** * 问题描述 */ @@ -141,18 +127,18 @@ public class ErpAfterSalesVo implements Serializable { * 售后总工时 */ @ExcelProperty(value = "售后总工时") - private Long totalWorkHours; + private BigDecimal totalWorkHours; /** * 售后总成本 */ @ExcelProperty(value = "售后总成本") - private Long totalCost; + private BigDecimal totalCost; /** - * 售后问题是否解决（0未解决 1已解决 2部分解决） + * 售后问题是否解决 */ - @ExcelProperty(value = "售后问题是否解决", converter = ExcelDictConvert.class) + @ExcelProperty(value = "解决状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "solve_status") private String solveStatus; @@ -169,7 +155,7 @@ public class ErpAfterSalesVo implements Serializable { private String processingResult; /** - * 售后状态（0暂存 1审批中 2可用） + * 售后状态 */ @ExcelProperty(value = "售后状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "after_sales_status") @@ -178,15 +164,12 @@ public class ErpAfterSalesVo implements Serializable { /** * 流程状态 */ - @ExcelProperty(value = "流程状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "flow_status") + @ExcelProperty(value = "流程状态") private String flowStatus; /** - * 激活标识（1是 0否） + * 激活标识 */ - @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "active_flag") private String activeFlag; /** @@ -200,16 +183,4 @@ public class ErpAfterSalesVo implements Serializable { */ private List laborCostsList; private List materialCostsList; - - /** - * 客户干系人姓名（逗号分隔） - */ - private String stakeholderName; - - /** - * 处理人姓名（逗号分隔） - */ - private String handlerName; - - }