工单提交

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java

@@ -103,6 +103,12 @@ public class AftersalesProcessingMoneyEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "支付单位")
 	private String paymentUnit;
+
+	/**
+	 * 工单Id
+	 */
+	@ApiModelProperty(value = "工单Id")
+	private Long workOrderId;
 	/**
 	 * 类型
 	 */

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java

@@ -244,6 +244,13 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	@ApiModelProperty(value = "审核时间")
 	@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date auditTime;
+
+	/**
+	 * 审核时间
+	 */
+	@ApiModelProperty(value = "审核时间")
+	@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date commitTime;
 	/**
 	 * 财务入账时间
 	 */

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderAllPageVO.java

@@ -0,0 +1,49 @@
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderAllPageVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private String workOrderType;
+	private String workOrderTypeName;
+	private String discoveryNode;
+	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 workOrderStatus;
+	private String workOrderStatusName;
+	private String processedBy;
+	private String responsiblePerson;
+	private Date createTime;
+	private Date endCreateTime;
+	private Date updateTime;
+	private String resultType;
+	private BigDecimal money;
+	private String warehouseServiceName;
+	private String headquartersName;
+	private String overTime;
+	private String isAppeal;
+	private String appealStatus;
+	private String appealStatusName;
+	private String processNumber;
+	private Date entryTime;
+	private Date entryMonthTime;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderAppealPageVO.java

@@ -0,0 +1,28 @@
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderAppealPageVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private Long workOrderId;
+	private String workOrderNumber;
+	private String workOrderStatus;
+	private String workOrderType;
+	private String warehouseName;
+	private String waybillNumber;
+	private String orderCode;
+	private String discoveryNode;
+	private String workOrderTypeName;
+	private String discoveryNodeName;
+	private String appealStatus;
+	private String appealStatusName;
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderCompensationPageVO.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 AftersalesWorkOrderCompensationPageVO {
+
+	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 updateTime;
+	private String resultType;
+	private BigDecimal money;
+	private String warehouseServiceName;
+	private String headquartersName;
+	private String businessName;
+	private String personResponsibleName;
+	private BigDecimal responsibilityRatio;
+	private String content;
+
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderEndPageVO.java

@@ -0,0 +1,76 @@
+/*
+ *      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 AftersalesWorkOrderEndPageVO {
+
+	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 Date arbitrationTime;
+	private Date auditTime;
+	private String resultType;
+	private BigDecimal money;
+	private String warehouseServiceName;
+	private String headquartersName;
+	private String indemnitorInfo;
+	private BigDecimal indemnitorMoney;
+	private String responsibleInfo;
+	private BigDecimal responsibleMoney;
+	private String businessName;
+	private String personResponsibleName;
+	private BigDecimal responsibilityRatio;
+	private String reasonArbitration;
+	private String isAppeal;
+	private String appealStatus;
+	private String appealStatusName;
+	private String processNumber;
+	private Date entryTime;
+	private Date entryMonthTime;
+
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderExaminePageVO.java

@@ -0,0 +1,65 @@
+/*
+ *      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 AftersalesWorkOrderExaminePageVO {
+
+	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 Date overTime;
+	private String resultType;
+	private BigDecimal money;
+	private String warehouseServiceName;
+	private String headquartersName;
+	private String businessName;
+	private String personResponsibleName;
+	private BigDecimal responsibilityRatio;
+	private String content;
+
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderInterventionPageVO.java

@@ -0,0 +1,65 @@
+/*
+ *      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 AftersalesWorkOrderInterventionPageVO {
+
+	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 endCreateTime;
+	private Date updateTime;
+	private String resultType;
+	private BigDecimal money;
+	private String warehouseServiceName;
+	private String businessName;
+	private String personResponsibleName;
+	private BigDecimal responsibilityRatio;
+	private String content;
+	private String isTimedOut;
+
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderProcessPageVO.java

@@ -0,0 +1,44 @@
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderProcessPageVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private String workOrderType;
+	private String workOrderTypeName;
+	private String discoveryNode;
+	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 workOrderStatus;
+	private String workOrderStatusName;
+	private String processedBy;
+	private String responsiblePerson;
+	private Date createTime;
+	private Date endCreateTime;
+	private Date updateTime;
+	private String resultType;
+	private String warehouseServiceName;
+	private String businessName;
+	private String personResponsibleName;
+	private String responsibilityRatio;
+	private String content;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderReplyPageVO.java

@@ -0,0 +1,44 @@
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderReplyPageVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private String workOrderType;
+	private String workOrderTypeName;
+	private String discoveryNode;
+	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 workOrderStatus;
+	private String workOrderStatusName;
+	private String processedBy;
+	private String responsiblePerson;
+	private Date createTime;
+	private Date endCreateTime;
+	private Date updateTime;
+	private String isTimedOut;
+	private String warehouseServiceName;
+	private String businessName;
+	private String personResponsibleName;
+	private String responsibilityRatio;
+	private String content;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderTimeOutPageVO.java

@@ -0,0 +1,26 @@
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderTimeOutPageVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private Long workOrderId;
+	private String workOrderNumber;
+	private String workOrderType;
+	private String workOrderTypeName;
+	private String discoveryNode;
+	private String discoveryNodeName;
+	private BigDecimal money;
+	private String timeout;
+	private String processedBy;
+	private String remarks;
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/apicontroller/AftersalesWorkOrderAppController.java

@@ -22,27 +22,27 @@ public class AftersalesWorkOrderAppController {
 
 	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
 
-	@PostMapping("/addWorkOrder")
-	public R addWorkOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
-		aftersalesWorkOrderDTO.setInitiationIdentification("PDA");
-		return R.data(aftersalesWorkOrderService.addWorkOrder(aftersalesWorkOrderDTO));
-	}
-
-
-	@PostMapping("/aftersalesPackageScan")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "工单包件扫描", notes = "传入aftersalesAppeal")
-	public R<List<AftersalesAbnormalPackageVO>> aftersalesPackageScan(@RequestBody AftersalesPackageScanDTO aftersalesPackageScanDTO){
-		return R.data(aftersalesWorkOrderService.aftersalesPackageScan(aftersalesPackageScanDTO));
-	}
-
-
-	@PostMapping("/saveAfterSalesOrder")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "PDA保存异常工单", notes = "传入aftersalesAppeal")
-	public R saveAfterSalesOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
-		return aftersalesWorkOrderService.saveAfterSalesOrder(aftersalesWorkOrderDTO);
-	}
+//	@PostMapping("/addWorkOrder")
+//	public R addWorkOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
+//		aftersalesWorkOrderDTO.setInitiationIdentification("PDA");
+//		return R.data(aftersalesWorkOrderService.addWorkOrder(aftersalesWorkOrderDTO));
+//	}
+
+
+//	@PostMapping("/aftersalesPackageScan")
+//	@ApiOperationSupport(order = 1)
+//	@ApiOperation(value = "工单包件扫描", notes = "传入aftersalesAppeal")
+//	public R<List<AftersalesAbnormalPackageVO>> aftersalesPackageScan(@RequestBody AftersalesPackageScanDTO aftersalesPackageScanDTO){
+//		return R.data(aftersalesWorkOrderService.aftersalesPackageScan(aftersalesPackageScanDTO));
+//	}
+
+
+//	@PostMapping("/saveAfterSalesOrder")
+//	@ApiOperationSupport(order = 1)
+//	@ApiOperation(value = "PDA保存异常工单", notes = "传入aftersalesAppeal")
+//	public R saveAfterSalesOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
+//		return aftersalesWorkOrderService.saveAfterSalesOrder(aftersalesWorkOrderDTO);
+//	}
 
 
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderQueryDTO.java

@@ -36,6 +36,9 @@ public class AftersalesWorkOrderQueryDTO extends AftersalesWorkOrderEntity {
 
 	private String workOrderType;
 	private String discoveryNode;
+	private String resultType;
+	private String businessName;
+	private String personResponsibleName;
 	private String workOrderNumber;
 	private String waybillNumber;
 	private String orderCode;
@@ -46,6 +49,7 @@ public class AftersalesWorkOrderQueryDTO extends AftersalesWorkOrderEntity {
 	private String workOrderStatus;
 	private String processedBy;
 	private String ceator;
+	private String exportIds;
 	private Date startCreateTime;
 	private Date endCreateTime;
 	private Date createTime;

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAllExcel.java

@@ -0,0 +1,190 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesWorkOrderAllExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 最晚处理时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最晚处理时间")
+	private Date endCreateTime;
+	/**
+	 * 最新操作时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新操作时间")
+	private Date updateTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果--理赔金额")
+	private BigDecimal money;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 总部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("总部处理客服")
+	private String headquartersName;
+	/**
+	 * 完结时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("完结时间")
+	private String overTime;
+	/**
+	 * 是否申诉
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否申诉")
+	private String isAppeal;
+	/**
+	 * 申诉状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("申诉状态")
+	private String appealStatusName;
+	/**
+	 * 钉钉号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("钉钉号")
+	private String processNumber;
+	/**
+	 * 财务入账时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("财务入账时间")
+	private Date entryTime;
+	/**
+	 * 财务入账月份
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("财务入账月份")
+	private Date entryMonthTime;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderAppealExcel.java

@@ -0,0 +1,62 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesWorkOrderAppealExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("申诉状态")
+	private String appealStatusName;
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderCompensationExcel.java

@@ -0,0 +1,166 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderCompensationExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 最新操作时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新操作时间")
+	private Date updateTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果--理赔金额")
+	private BigDecimal money;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 总部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("总部处理客服")
+	private String headquartersName;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新回复内容")
+	private String content;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderCompleteExcel.java

@@ -0,0 +1,166 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderCompleteExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 工单提交时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单提交时间")
+	private Date commitTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果--理赔金额")
+	private BigDecimal money;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 总部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("总部处理客服")
+	private String headquartersName;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 金额/占比
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新回复内容")
+	private String content;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderEndExcel.java

@@ -0,0 +1,227 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderEndExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 工单提交时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单提交时间")
+	private Date commitTime;
+	private Date arbitrationTime;
+	/**
+	 * 工单提交时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("审核时间")
+	private Date auditTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果--理赔金额")
+	private BigDecimal money;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 总部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("总部处理客服")
+	private String headquartersName;
+	/**
+	 * 赔款方信息
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("赔款方信息")
+	private String indemnitorInfo;
+	/**
+	 * 赔款方总金额
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("赔款方总金额")
+	private BigDecimal indemnitorMoney;
+	/**
+	 * 受款方信息
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("受款方信息")
+	private String responsibleInfo;
+	/**
+	 * 受款方总金额
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("受款方总金额")
+	private BigDecimal responsibleMoney;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 金额/占比
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比222")
+	private String reasonArbitration;
+	/**
+	 * 是否申诉
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否申诉")
+	private String isAppeal;
+	/**
+	 * 是否申诉
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("申诉状态")
+	private String appealStatusName;
+	/**
+	 * 钉钉号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("钉钉号")
+	private String processNumber;
+	/**
+	 * 财务入账时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("财务入账时间")
+	private Date entryTime;
+	/**
+	 * 财务入账月份
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("财务入账月份")
+	private Date entryMonthTime;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExamineExcel.java

@@ -0,0 +1,172 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderExamineExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 工单提交时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单提交时间")
+	private Date commitTime;
+	/**
+	 * 完结时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("完结时间")
+	private Date overTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果--理赔金额")
+	private BigDecimal money;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 总部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("总部处理客服")
+	private String headquartersName;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新回复内容")
+	private String content;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderInterventionExcel.java

@@ -0,0 +1,172 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderInterventionExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 最晚处理时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最晚处理时间")
+	private Date endCreateTime;
+	/**
+	 * 最新操作时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新操作时间")
+	private Date updateTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果--理赔金额")
+	private BigDecimal money;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新回复内容")
+	private String content;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否超时")
+	private String isTimedOut;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderProcessExcel.java

@@ -0,0 +1,159 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderProcessExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 最晚处理时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最晚处理时间")
+	private Date endCreateTime;
+	/**
+	 * 最新操作时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新操作时间")
+	private Date updateTime;
+	/**
+	 * 处理结果
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理结果")
+	private String resultType;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新回复内容")
+	private String content;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderReplyExcel.java

@@ -0,0 +1,159 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderReplyExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 工单创建仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建仓")
+	private String warehouseName;
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+	/**
+	 * 商场名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String waybillMall;
+	/**
+	 * 一级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private String first;
+	/**
+	 * 二级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private String secondary;
+	/**
+	 * 三级品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private String thirdProduct;
+	/**
+	 * 工单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单状态")
+	private String workOrderStatusName;
+	/**
+	 * 工单处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单处理方")
+	private String processedBy;
+	/**
+	 * 责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任方")
+	private String responsiblePerson;
+	/**
+	 * 工单创建时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单创建时间")
+	private Date createTime;
+	/**
+	 * 最晚处理时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最晚处理时间")
+	private Date endCreateTime;
+	/**
+	 * 最新操作时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新操作时间")
+	private Date updateTime;;
+	/**
+	 * 是否超时
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否超时")
+	private String isTimedOut;
+	/**
+	 * 营业部处理客服
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("营业部处理客服")
+	private String warehouseServiceName;
+	/**
+	 * 内部责任方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任方")
+	private String businessName;
+	/**
+	 * 内部责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内部责任人")
+	private String personResponsibleName;
+	/**
+	 * 金额/占比
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额/占比")
+	private String responsibilityRatio;
+	/**
+	 * 最新回复内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新回复内容")
+	private String content;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderTimeOutExcel.java

@@ -0,0 +1,58 @@
+package com.logpm.aftersales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class AftersalesWorkOrderTimeOutExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 异常工单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 异常类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常类型")
+	private String workOrderTypeName;
+	/**
+	 * 发现节点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现节点")
+	private String discoveryNodeName;
+	/**
+	 * 金额
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("金额")
+	private BigDecimal money;
+	/**
+	 * 超时时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("超时时间")
+	private String timeout;
+	/**
+	 * 处理方
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("处理方")
+	private String processedBy;
+	/**
+	 * 备注
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String remarks;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java

@@ -75,7 +75,7 @@ public class AftersalesXxlJob {
 	@XxlJob("overTimeAfterSales")
 	public ReturnT<String> overTimeAfterSales(String param) throws Exception {
 		logger.info("修改预账单工单是否可以申述>>>>>>>>{}", param);
-		aftersalesWorkOrderService.overTimeAfterSales();
+		aftersalesWorkOrderService.overTimeAfterSales(param);
 		return ReturnT.SUCCESS;
 	}
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java

@@ -130,7 +130,7 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 * 查询所有的
 	 * @return
 	 */
-	List<AftersalesProcessorEntity> overTimeAfterSalesList();
+	List<AftersalesProcessorEntity> overTimeAfterSalesList(@Param("timeout") String timeout);
 
 
 	/**
@@ -212,7 +212,7 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 * @param warehouseIds
 	 * @return
 	 */
-	List<AftersalesWorkOrderCompensationPageExcel> selectCompensationWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+	List<AftersalesWorkOrderCompensationExcel> selectCompensationWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
 
 	/**
 	 * 处理完毕导出数据

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -1251,7 +1251,7 @@
         lbp.types_of = 2
         AND lbp.processing_status IN ('1','3')
         AND lbp.is_deleted = 0
-        AND DATEDIFF(DATE_FORMAT(lbp.create_time,'%y%m%d'), DATE_FORMAT(now(),'%y%m%d')) <= -3
+        AND DATEDIFF(DATE_FORMAT(lbp.create_time,'%y%m%d'), DATE_FORMAT(now(),'%y%m%d')) <= #{timeout}
 <!--        AND DATE_FORMAT(lbp.create_time,'%y%m%d') >= DATE_FORMAT( '2025-01-01', '%y%m%d' )-->
     </select>
     <select id="selectAllWorkOrderPage" resultType="com.logpm.aftersales.vo.AftersalesWorkOrderAllPageVO">
@@ -2774,7 +2774,7 @@
         END discoveryNodeName,
         laof.money,
         laof.timeout,
-        lawo.processed_by,
+        lawo.processed_by AS processedBy,
         laof.remarks
         FROM
         logpm_aftersales_overtime_fine AS laof
@@ -3293,7 +3293,7 @@
         lawo.create_time DESC) AS t
     </select>
     <select id="selectCompensationWorkOrderExcelData"
-            resultType="com.logpm.aftersales.excel.AftersalesWorkOrderCompensationPageExcel">
+            resultType="com.logpm.aftersales.excel.AftersalesWorkOrderCompensationExcel">
         SELECT t.* FROM (        SELECT
         lawo.work_order_type AS workOrderType,
         CASE
@@ -4188,6 +4188,9 @@
         LEFT JOIN logpm_aftersales_appeal AS laa ON laa.work_order_id = lawo.id
         AND laa.is_deleted = 0
         AND laa.types_of != 2
+        LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id
+        AND lap.conditions IN ( 1, 3 )
+        AND lap.is_deleted = 0
         <where>
             lawo.is_deleted = 0
             AND lawo.work_order_status = '80'
@@ -4343,10 +4346,13 @@
         AND lawo.is_deleted = 0
         LEFT JOIN logpm_aftersales_abnormal_package AS laap ON laap.work_order_id = lawo.id
         AND laap.is_deleted = 0
+        LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id
+        AND lap.conditions IN ( 1, 3 )
+        AND lap.is_deleted = 0
         <where>
             laa.is_deleted = 0
             <if test="warehouseIds != null">
-                AND  laa.warehouse_id IN
+                AND  lap.business_id IN
                 <foreach collection="warehouseIds" item="warehouseId" close=")" separator="," open="(">
                     #{warehouseId}
                 </foreach>
@@ -4449,6 +4455,9 @@
         FROM
         logpm_aftersales_overtime_fine AS laof
         LEFT JOIN logpm_aftersales_work_order AS lawo ON lawo.id = laof.work_order_id AND lawo.is_deleted = 0 AND lawo.is_deleted = 0
+        LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id
+        AND lap.conditions IN ( 1, 3 )
+        AND lap.is_deleted = 0
         <where>
             laof.is_deleted = 0
             <if test="warehouseIds != null">
@@ -4598,6 +4607,9 @@
         LEFT JOIN logpm_aftersale_survey_record AS lasr ON lasr.work_order_id = lawo.id  AND lasr.is_deleted = 0 AND lasr.difference = '1'
         LEFT JOIN logpm_aftersales_processing_results AS laprr ON laprr.work_order_id = lawo.id AND laprr.is_deleted = 0
         LEFT JOIN logpm_aftersales_overtime_fine AS laof ON laof.work_order_id = lawo.id AND laof.is_deleted = 0
+        LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id
+        AND lap.conditions IN ( 1, 3 )
+        AND lap.is_deleted = 0
         <where>
             lawo.is_deleted = 0
             AND lawo.work_order_status = '70'

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -315,7 +315,7 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	/**
 	 * 处理工单超时
 	 */
-	void overTimeAfterSales();
+	void overTimeAfterSales(String param);
 
 	/**
 	 * 查询全部工单信息

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -569,7 +569,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			}
 		}
 		//是否需要进行标记处理方的处理结果提交
-		boolean isResult;
 		if (!Objects.isNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO())) {
 			//进行处理结果处理
 			AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO = aftersalesWorkOrder.getAftersalesProcessingResultsDTO();
@@ -599,22 +598,23 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.lipeijineweichu.getValue());
 			}
 			workOrderEntity.setWarehouseServiceName(user.getNickName());
-			isResult = true;
-		} else {
-			isResult = false;
 		}
 		//对处理方和责任方进行记录
 		processorEntityList.stream().forEach(p -> {
 			p.setWorkOrderId(workOrderEntity.getId());
 			p.setWarehouseId(workOrderEntity.getWarehouseId());
 			p.setProcessingStatus(ProcessorProcessingStatusStatusConstant.daichuli.getValue());
-			if (isResult) {
-				//存在处理结果提交方
-				if (p.getBusinessId().equals(myCurrentWarehouse.getId()) && "2".equals(p.getTypesOf())) {
-					p.setProcessingStatus(ProcessorProcessingStatusStatusConstant.tijiaofang.getValue());
-				}
-			}
 		});
+		//提交创建方
+		AftersalesProcessorEntity createProcessorEntity = new AftersalesProcessorEntity();
+		createProcessorEntity.setTypesOf("3");
+		createProcessorEntity.setWarehouseId(myCurrentWarehouse.getId());
+		createProcessorEntity.setWorkOrderId(workOrderEntity.getId());
+		createProcessorEntity.setBusinessName(myCurrentWarehouse.getName());
+		createProcessorEntity.setBusinessId(myCurrentWarehouse.getId());
+		createProcessorEntity.setProcessingStatus("5");
+		createProcessorEntity.setConditions("1");
+		processorEntityList.add(createProcessorEntity);
 		//添加创建方
 		AftersalesProcessorEntity aftersalesProcessorEntity = new AftersalesProcessorEntity();
 		aftersalesProcessorEntity.setWorkOrderId(workOrderEntity.getId());
@@ -3029,13 +3029,13 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	}
 
 	@Override
-	public void overTimeAfterSales() {
+	public void overTimeAfterSales(String param) {
 		//获取道处理方或者责任方的id
 
 		String[] strings = new String[]{ProcessorProcessingStatusStatusConstant.daichuli.getValue(), ProcessorProcessingStatusStatusConstant.yichaoshi.getValue()};
 		List<String> list1 = Arrays.asList(strings);
 		//查询所有的超时列表,包括已经超时的
-		List<AftersalesProcessorEntity> processorEntityList = baseMapper.overTimeAfterSalesList();
+		List<AftersalesProcessorEntity> processorEntityList = baseMapper.overTimeAfterSalesList(param);
 		if (!processorEntityList.isEmpty()) {
 			for (AftersalesProcessorEntity processorEntity : processorEntityList) {
 				// 假设有两个时间戳（秒数）
@@ -3214,8 +3214,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				break;
 			case 5:
 				//理赔金未出
-				List<AftersalesWorkOrderCompensationPageExcel> aftersalesWorkOrderCompensationPageExcelList = baseMapper.selectCompensationWorkOrderExcelData(workOrderQueryDTO, warehouseIds);
-				ExcelUtil.export(response, "理赔金未出异常工单数据" + org.springblade.core.tool.utils.DateUtil.time(), "理赔金未出异常工单数据", aftersalesWorkOrderCompensationPageExcelList, AftersalesWorkOrderCompensationPageExcel.class);
+				List<AftersalesWorkOrderCompensationExcel> aftersalesWorkOrderCompensationPageExcelList = baseMapper.selectCompensationWorkOrderExcelData(workOrderQueryDTO, warehouseIds);
+				ExcelUtil.export(response, "理赔金未出异常工单数据" + org.springblade.core.tool.utils.DateUtil.time(), "理赔金未出异常工单数据", aftersalesWorkOrderCompensationPageExcelList, AftersalesWorkOrderCompensationExcel.class);
 				break;
 			case 6:
 				//处理完毕

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -1611,6 +1611,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							String content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "一键装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 							JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
 							logList.add(trunklinePackageTrackLog);
+							//进行解托下架
+							warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId(),"一件装车解托下架");
 						}
 					}
 					break;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1412,6 +1412,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			log.error(method + "查询自提错误:{}", distrilbutionBillLading.getId());
 			return R.fail("请联系管理员处理");
 		}
+		if (BillLadingStatusConstant.yiqianshou.getValue().equals(billLadingEntity.getConditions())) {
+			return R.fail("当前自提单已完成复核");
+		}
 
 		//查询选择包件是否存在有效数据
 		List<Long> list = Func.toLongList(distrilbutionBillLading.getPackageIds());