From 1f6252afc567ce22094fdcc30ea148b267fe84fc Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 20 Jan 2025 16:01:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/excel/AftersalesWorkOrderAppealExcel.java | 6 ------ .../aftersales/excel/AftersalesWorkOrderEndExcel.java | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAppealExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAppealExcel.java index f7a91bc17..478496673 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAppealExcel.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAppealExcel.java @@ -35,12 +35,6 @@ public class AftersalesWorkOrderAppealExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("发现节点") private String discoveryNodeName; - /** - * 工单创建仓 - */ - @ColumnWidth(20) - @ExcelProperty("工单创建仓") - private String warehouseName; /** * 运单号 */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderEndExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderEndExcel.java index 3b0ce0908..f9f404785 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderEndExcel.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderEndExcel.java @@ -114,6 +114,11 @@ public class AftersalesWorkOrderEndExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("工单提交时间") private Date commitTime; + /** + * 工单提交时间 + */ + @ColumnWidth(20) + @ExcelProperty("工单仲裁时间") private Date arbitrationTime; /** * 工单提交时间 @@ -191,7 +196,7 @@ public class AftersalesWorkOrderEndExcel implements Serializable { * 内部责任人 */ @ColumnWidth(20) - @ExcelProperty("金额/占比222") + @ExcelProperty("仲裁原因") private String reasonArbitration; /** * 是否申诉 From 821aed74e905b1d1d22ab0b4ef11ed44e085a31e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 20 Jan 2025 16:04:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/AftersalesWorkOrderCompletePageVO.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderCompletePageVO.java diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderCompletePageVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderCompletePageVO.java new file mode 100644 index 000000000..07414254b --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderCompletePageVO.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 客服异常工单 视图实体类 + * + * @author BladeX + * @since 2023-11-17 + */ +@Data +public class AftersalesWorkOrderCompletePageVO { + + private Long id; + private String workOrderType; + private String discoveryNode; + private String workOrderStatus; + private String workOrderTypeName; + private String discoveryNodeName; + private String warehouseName; + private String workOrderNumber; + private String waybillNumber; + private String orderCode; + private String packageCode; + private String brandName; + private String waybillMall; + private String first; + private String secondary; + private String thirdProduct; + private String workOrderStatusName; + private String processedBy; + private String responsiblePerson; + private Date createTime; + private Date commitTime; + private String resultType; + private BigDecimal money; + private String warehouseServiceName; + private String headquartersName; + private String businessName; + private String personResponsibleName; + private BigDecimal responsibilityRatio; + private String content; + + +}