Browse Source

Merge branch 'dev' into pre-production

pre-production
zhaoqiaobo 1 month ago
parent
commit
eada78287a
  1. 64
      blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderCompletePageVO.java
  2. 6
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAppealExcel.java
  3. 7
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderEndExcel.java

64
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;
}

6
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;
/**
* 运单号
*/

7
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;
/**
* 是否申诉

Loading…
Cancel
Save