fix(erp/afterSales):修复售后导出功能 500 异常及优化数据显示

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<ErpAfterSalesLaborCostsVo> laborCostsList;
     private List<ErpAfterSalesMaterialCostsVo> materialCostsList;
-
-    /**
-     * 客户干系人姓名（逗号分隔）
-     */
-    private String stakeholderName;
-
-    /**
-     * 处理人姓名（逗号分隔）
-     */
-    private String handlerName;
-
-
 }