From f6fd251060b3b97b2c124cefba55993737f97d2c Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Wed, 6 Dec 2023 18:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86=E6=96=B9?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AftersalesOvertimeFineEntity.java  | 17 ++++-
 .../AftersalesProcessingMoneyEntity.java      | 21 ++++++
 .../AftersalesProcessingResultsEntity.java    |  6 +-
 .../entity/AftersalesProcessorEntity.java     |  7 +-
 .../aftersales/vo/AftersalesWorkOrderVO.java  | 14 ++++
 .../AftersalesOvertimeFineController.java     | 11 +++
 .../dto/AftersalesProcessingResultsDTO.java   |  2 +-
 .../mapper/AftersalesOvertimeFineMapper.java  |  7 ++
 .../mapper/AftersalesOvertimeFineMapper.xml   |  9 ++-
 .../IAftersalesOvertimeFineService.java       |  8 +++
 .../impl/AftersalesExchangeServiceImpl.java   | 27 ++++++-
 .../AftersalesOvertimeFineServiceImpl.java    | 19 +++++
 ...ftersalesProcessingResultsServiceImpl.java | 13 ++--
 .../impl/AftersalesWorkOrderServiceImpl.java  | 71 ++++++++++++++-----
 14 files changed, 201 insertions(+), 31 deletions(-)

diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java
index ee79132cc..f00c09357 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java
@@ -81,7 +81,22 @@ public class AftersalesOvertimeFineEntity extends TenantEntity {
 	 * 仓库ID
 	 */
 	@ApiModelProperty(value = "仓库ID")
-	private String warehouseId;
+	private Long warehouseId;
+	/**
+	 * 超时时间
+	 */
+	@ApiModelProperty(value = "处理方名称")
+	private String  businessName;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "处理方ID")
+	private Long businessId;
+	/**
+	 * 处理方ID
+	 */
+	@ApiModelProperty(value = "处理方ID")
+	private Long processorId;
 	/**
 	 * 备注
 	 */
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java
index eb7afaf34..97012b3c8 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java
@@ -82,5 +82,26 @@ public class AftersalesProcessingMoneyEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "类型")
 	private String typesOf;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "赔付方式")
+	private String compensationMethod;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "赔付方式名称")
+	private String compensationMethodName;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "处理结果名称")
+	private String resultName;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "赔付时间")
+	private String compensationTime;
+
 
 }
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java
index d9caf1f77..da418bb51 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java
@@ -17,6 +17,7 @@
 package com.logpm.aftersales.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -83,6 +84,7 @@ public class AftersalesProcessingResultsEntity extends TenantEntity {
 	 * 赔付时间
 	 */
 	@ApiModelProperty(value = "赔付时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
 	private Date compensationTime;
 	/**
 	 * 赔付凭证
@@ -98,12 +100,12 @@ public class AftersalesProcessingResultsEntity extends TenantEntity {
 	 * 异常工单ID
 	 */
 	@ApiModelProperty(value = "异常工单ID")
-	private String workOrderId;
+	private Long workOrderId;
 	/**
 	 * 仓库ID
 	 */
 	@ApiModelProperty(value = "仓库ID")
-	private String warehouseId;
+	private Long warehouseId;
 
 
 
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java
index 449822710..1b934eaba 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java
@@ -70,7 +70,7 @@ public class AftersalesProcessorEntity extends TenantEntity {
 	 * ID
 	 */
 	@ApiModelProperty(value = "ID")
-	private String businessId;
+	private Long businessId;
 	/**
 	 * 异常工单ID
 	 */
@@ -86,6 +86,11 @@ public class AftersalesProcessorEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "类型")
 	private String typesOf;
+	/**
+	 * 处理状态 类型 1 待处理 2 已处理
+	 */
+	@ApiModelProperty(value = "处理状态")
+	private String processingStatus;
 	/**
 	 * 仓库ID
 	 */
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java
index ec650c453..8b8a64850 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java
@@ -56,6 +56,20 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
 	private List<AftersalesDecreaseImageVO> decreaseImageVOList;
 
 
+	private AftersalesProcessingResultsVO processingResultsVO;
+	/**
+	 * 处理方名称
+	 */
+	private String businessName;
+	/**
+	 * 处理方ID
+	 */
+	private Long businessId;
+
+	/**
+	 * processor表 处理方ID
+	 */
+	private Long processorId;
 
 
 
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java
index 0d5c2dd6c..d545b64ba 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java
@@ -80,6 +80,17 @@ public class AftersalesOvertimeFineController extends BladeController {
 		return R.data(AftersalesOvertimeFineWrapper.build().pageVO(pages));
 	}
 
+	/**
+	 * 异常工单超时记录表 分页
+	 */
+	@GetMapping("/listOwn")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesOvertimeFine")
+	public R<IPage<AftersalesOvertimeFineVO>> listOwn(@ApiIgnore @RequestParam Map<String, Object> aftersalesOvertimeFine, Query query) {
+		IPage<AftersalesOvertimeFineEntity> pages = aftersalesOvertimeFineService.pageOwn(Condition.getPage(query),aftersalesOvertimeFine);
+		return R.data(AftersalesOvertimeFineWrapper.build().pageVO(pages));
+	}
+
 	/**
 	 * 异常工单超时记录表 自定义分页
 	 */
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java
index 19e5dffbf..96147afb7 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java
@@ -31,7 +31,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class AftersalesProcessingResultsDTO extends AftersalesProcessingResultsEntity {
+public class   AftersalesProcessingResultsDTO extends AftersalesProcessingResultsEntity {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 处理结果类型
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java
index d4a18d14c..32c0a4a4e 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java
@@ -51,4 +51,11 @@ public interface AftersalesOvertimeFineMapper extends BaseMapper<AftersalesOvert
 	 */
 	List<AftersalesOvertimeFineExcel> exportAftersalesOvertimeFine(@Param("ew") Wrapper<AftersalesOvertimeFineEntity> queryWrapper);
 
+	/**
+	 * 查询
+	 * @param page
+	 * @param overtimeFineEntity
+	 * @return
+	 */
+    IPage<AftersalesOvertimeFineVO> pageListOwn(IPage<Object> page,@Param("param") AftersalesOvertimeFineEntity overtimeFineEntity);
 }
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml
index 2cc6a66c5..05db1d975 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml
@@ -24,7 +24,14 @@
         <result column="warehouse_id" property="warehouseId"/>
         <result column="remarks" property="remarks"/>
     </resultMap>
-
+    <select id="pageListOwn" resultType="com.logpm.aftersales.vo.AftersalesOvertimeFineVO" >
+        select lawo.work_order_number,lawo.work_order_type,lawo.discovery_node,COUNT(laof.id),laof.create_time,laof.timeout
+        from logpm_aftersales_overtime_fine  laof
+                 LEFT JOIN logpm_aftersales_work_order lawo on lawo.id = laof.work_order_id
+        <where>
+            <if test=" param. != null and param. != ''">and   = #{param. }</if>
+        </where>
+    </select>
 
     <select id="selectAftersalesOvertimeFinePage" resultMap="aftersalesOvertimeFineResultMap">
         select * from logpm_aftersales_overtime_fine where is_deleted = 0
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java
index e07f3eff4..3fff07c50 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java
@@ -23,6 +23,7 @@ import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 异常工单超时记录表 服务类
@@ -49,4 +50,11 @@ public interface IAftersalesOvertimeFineService extends BaseService<AftersalesOv
 	 */
 	List<AftersalesOvertimeFineExcel> exportAftersalesOvertimeFine(Wrapper<AftersalesOvertimeFineEntity> queryWrapper);
 
+	/**
+	 * 查询超时记录数据
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+    IPage<AftersalesOvertimeFineEntity> pageOwn(IPage<Object> page, Map<String, Object>  queryWrapper);
 }
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java
index 85e22186a..62c03905b 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java
@@ -18,8 +18,11 @@ package com.logpm.aftersales.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.aftersales.entity.AftersalesExchangeEntity;
+import com.logpm.aftersales.entity.AftersalesProcessorEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import com.logpm.aftersales.service.IAftersalesProcessorService;
 import com.logpm.aftersales.service.IAftersalesWorkOrderService;
 import com.logpm.aftersales.service.WebSocketServer;
 import com.logpm.aftersales.vo.AftersalesExchangeVO;
@@ -27,8 +30,11 @@ import com.logpm.aftersales.excel.AftersalesExchangeExcel;
 import com.logpm.aftersales.mapper.AftersalesExchangeMapper;
 import com.logpm.aftersales.service.IAftersalesExchangeService;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -54,6 +60,8 @@ import java.util.Optional;
 public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExchangeMapper, AftersalesExchangeEntity> implements IAftersalesExchangeService {
 
 	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+	private final IAftersalesProcessorService  aftersalesProcessorService;
 
 	private static int count=0;
 
@@ -80,7 +88,10 @@ public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExc
 	@Override
 	public boolean ownSaveOrUpdate(AftersalesExchangeEntity aftersalesExchange) {
 		BladeUser user = AuthUtil.getUser();
-
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtil.isNull(myCurrentWarehouse)){
+			throw new ServiceException("请选择仓库！！");
+		}
 
 		if(ObjectUtil.isNull(aftersalesExchange.getId())){
 			//修改工单状态
@@ -94,6 +105,20 @@ public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExc
 					aftersalesWorkOrderService.updateById(aftersalesWorkOrder);
 				}
 			}
+			AftersalesProcessorEntity one = aftersalesProcessorService.getOne(Wrappers.<AftersalesProcessorEntity>query().lambda()
+				.eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesExchange.getWorkOrderId())
+				.eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId())
+				.eq(AftersalesProcessorEntity::getTypesOf,"2")
+				.eq(AftersalesProcessorEntity::getIsDeleted, "0")
+			);
+			if(ObjectUtil.isNull(one)){
+				throw  new ServiceException("处理方信息不存在！！");
+			}
+			if("1".equals(one.getProcessingStatus())){
+				//修改处理状态
+				one.setProcessingStatus("2");
+				aftersalesProcessorService.updateById(one);
+			}
 
 			//添加回复处理交流数据
 			aftersalesExchange.setCreateTime(new Date());
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java
index b73b90c55..0cdce05fc 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java
@@ -16,16 +16,19 @@
  */
 package com.logpm.aftersales.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity;
 import com.logpm.aftersales.vo.AftersalesOvertimeFineVO;
 import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel;
 import com.logpm.aftersales.mapper.AftersalesOvertimeFineMapper;
 import com.logpm.aftersales.service.IAftersalesOvertimeFineService;
+import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 异常工单超时记录表 服务实现类
@@ -51,4 +54,20 @@ public class AftersalesOvertimeFineServiceImpl extends BaseServiceImpl<Aftersale
 		return aftersalesOvertimeFineList;
 	}
 
+	/**
+	 * 查询超时记录
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+	@Override
+	public IPage<AftersalesOvertimeFineEntity> pageOwn(IPage<Object> page, Map<String, Object> queryWrapper) {
+
+		AftersalesOvertimeFineEntity overtimeFineEntity = JSONObject.parseObject(JSONObject.toJSONString(queryWrapper), AftersalesOvertimeFineEntity.class);
+		IPage<AftersalesOvertimeFineVO> overtimeFineVOIPage = baseMapper.pageListOwn(page,overtimeFineEntity);
+		//todo 处理数据
+
+		return null;
+	}
+
 }
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java
index e4342f27b..9231ce90c 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java
@@ -96,18 +96,21 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 	}
 
 	/**
-	 *
+	 * 查询处理结果数据
 	 * @param aftersalesProcessingResults
 	 * @return
 	 */
 	@Override
 	public AftersalesProcessingResultsVO getQueryProcessing(AftersalesProcessingResultsEntity aftersalesProcessingResults) {
-		AftersalesProcessingResultsEntity aftersalesProcessingResultsEntity = baseMapper.selectById(aftersalesProcessingResults.getWorkOrderId());
-		if(ObjectUtil.isNull(aftersalesProcessingResultsEntity)){
+//		AftersalesProcessingResultsEntity aftersalesProcessingResultsEntity = baseMapper.selectById(aftersalesProcessingResults.getWorkOrderId());
+		List<AftersalesProcessingResultsEntity> processingResultsEntityList = baseMapper.selectList(Wrappers.<AftersalesProcessingResultsEntity>query().lambda()
+			.eq(AftersalesProcessingResultsEntity::getWorkOrderId, aftersalesProcessingResults.getWorkOrderId())
+		);
+		if(processingResultsEntityList.isEmpty() || ObjectUtil.isNull( processingResultsEntityList.get(0))){
 			return new AftersalesProcessingResultsVO();
 		}
 		List<AftersalesProcessingMoneyEntity> list = aftersalesProcessingMoneyService.list(Wrappers.<AftersalesProcessingMoneyEntity>query().lambda()
-			.eq(AftersalesProcessingMoneyEntity::getProcessingResultsId, aftersalesProcessingResultsEntity.getId())
+			.eq(AftersalesProcessingMoneyEntity::getProcessingResultsId, processingResultsEntityList.get(0).getId())
 		);
 		List<AftersalesProcessingMoneyVO> processingMoneyEntityList = new ArrayList<>();
 
@@ -119,7 +122,7 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 			processingMoneyEntityList.add(processingMoneyVO);
 		});
 		AftersalesProcessingResultsVO processingResultsVO = new AftersalesProcessingResultsVO();
-		BeanUtil.copyProperties(aftersalesProcessingResultsEntity,processingResultsVO);
+		BeanUtil.copyProperties(processingResultsEntityList.get(0),processingResultsVO);
 		processingResultsVO.setProcessingMoneyEntityList(processingMoneyEntityList);
 		return processingResultsVO;
 	}
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index cce96c7e7..19afd0e83 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -22,13 +22,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.entity.*;
 import com.logpm.aftersales.service.*;
-import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
-import com.logpm.aftersales.vo.AftersalesDecreaseImageVO;
-import com.logpm.aftersales.vo.AftersalesProcessorVO;
-import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
+import com.logpm.aftersales.vo.*;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -78,6 +76,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	private final IAftersalesProcessorService aftersalesProcessorService;
 	private final IAftersalesCompletionRecordService completionRecordService;
 	private final IAftersalesCompletionRecipientService completionRecipientService;
+	private final IAftersalesProcessingResultsService aftersalesProcessingResultsService;
 	private final IAftersalesOvertimeFineService aftersalesOvertimeFineService;
 
 	private final IBasicdataWarehouseClient warehouseClient;
@@ -240,6 +239,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				BeanUtil.copyProperties(i,packageEntity);
 				packageEntity.setWorkOrderId(aftersalesWorkOrder.getId());
 				packageEntity.setConditions("1");//正常
+				packageEntity.setProcessingStatus("1");//待处理
 				packageEntity.setWarehouseId(myCurrentWarehouse.getId());
 				list.add(packageEntity);
 			});
@@ -328,11 +328,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	public void getIsItTimeout() {
 
 		List<AftersalesWorkOrderEntity> aftersalesWorkOrderEntities = baseMapper.selectList(Wrappers.<AftersalesWorkOrderEntity>query().lambda()
-			.eq(AftersalesWorkOrderEntity::getWorkOrderStatus, WorkOrderStatusConstant.daichuli.getValue())
 			.eq(AftersalesWorkOrderEntity::getIsDeleted,0)
+			.apply("work_order_status  in (10,20)")
 		);
 		if(!aftersalesWorkOrderEntities.isEmpty()){
-			List<AftersalesWorkOrderEntity> collect = aftersalesWorkOrderEntities.stream().filter(i -> {
+			List<AftersalesWorkOrderVO> workOrderVOList = new ArrayList<>();
+			for (AftersalesWorkOrderEntity i : aftersalesWorkOrderEntities) {
 				// 获取当前时间
 				LocalDateTime now = LocalDateTime.now();
 				// 获取48小时前的时间
@@ -342,14 +343,32 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				long l = i.getCreateTime().getTime() / 1000;
 				long l1 = timestamp - l;
 				if (l1 > 0) {
-					//以超时
-					return true;
+					//查询处理方是否处理
+					List<AftersalesProcessorEntity> list = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda()
+						.eq(AftersalesProcessorEntity::getWorkOrderId, i.getId())
+						.eq(AftersalesProcessorEntity::getTypesOf, "2")
+						.eq(AftersalesProcessorEntity::getProcessingStatus, "1")
+					);
+					if(list.isEmpty()){
+						continue;
+					}
+					list.forEach( a ->{
+						AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO();
+						BeanUtil.copyProperties(i,aftersalesWorkOrderVO);
+						//以超时
+						aftersalesWorkOrderVO.setBusinessName(a.getBusinessName());
+						aftersalesWorkOrderVO.setBusinessId(a.getBusinessId());
+						aftersalesWorkOrderVO.setProcessorId(a.getId());
+						workOrderVOList.add(aftersalesWorkOrderVO);
+					});
+
 				} else {
-					return false;
+					continue;
 				}
-			}).collect(Collectors.toList());
-			if(!collect.isEmpty()){
-				collect.forEach(i ->{
+			}
+
+			if(!workOrderVOList.isEmpty()){
+				workOrderVOList.forEach(i ->{
 
 					// 假设有两个时间戳（秒数）
 					long timestamp1 = new Date().getTime() / 1000; // 现在时间
@@ -378,22 +397,28 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 						//第一次超时
 						if(size == 0 ){
 							//处理超时数据
-							AftersalesWorkOrderEntity aftersalesWorkOrder = new AftersalesWorkOrderVO();
-							aftersalesWorkOrder.setWorkOrderStatus(WorkOrderStatusConstant.chaoshiweichuli.getValue());
-							aftersalesWorkOrder.setId(i.getId());
-							baseMapper.updateById(aftersalesWorkOrder);
+							AftersalesProcessorEntity processor = new AftersalesProcessorEntity();
+							processor.setProcessingStatus("3");//回复超时
+							processor.setId(i.getProcessorId());
+							aftersalesProcessorService.updateById(processor);
 							//添加超时记录
 							AftersalesOvertimeFineEntity overtimeFineEntity = new AftersalesOvertimeFineEntity();
 							overtimeFineEntity.setWorkOrderId(i.getId());
-							overtimeFineEntity.setMoney(BigDecimal.valueOf(20));
+							overtimeFineEntity.setMoney(BigDecimal.valueOf(50));
 							overtimeFineEntity.setTimeout(String.valueOf(hours));
+							overtimeFineEntity.setBusinessId(i.getBusinessId());
+							overtimeFineEntity.setBusinessName(i.getBusinessName());
+							overtimeFineEntity.setProcessorId(i.getProcessorId());
 							aftersalesOvertimeFineService.save(overtimeFineEntity);
 						}else  if(q > size){
 							//添加新的超时记录
 							AftersalesOvertimeFineEntity overtimeFineEntity = new AftersalesOvertimeFineEntity();
 							overtimeFineEntity.setWorkOrderId(i.getId());
-							overtimeFineEntity.setMoney(BigDecimal.valueOf(20));
+							overtimeFineEntity.setMoney(BigDecimal.valueOf(50));
 							overtimeFineEntity.setTimeout(String.valueOf(hours));
+							overtimeFineEntity.setBusinessId(i.getBusinessId());
+							overtimeFineEntity.setBusinessName(i.getBusinessName());
+							overtimeFineEntity.setProcessorId(i.getProcessorId());
 							aftersalesOvertimeFineService.save(overtimeFineEntity);
 
 						}
@@ -402,6 +427,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				});
 
 			}
+
 		}
 
 	}
@@ -491,7 +517,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				return decreaseImageVO;
 			}).collect(Collectors.toList());
 			aftersalesWorkOrderVO.setDecreaseImageVOList(decreaseImageVOS);
-
+			//查询处理结果
+			AftersalesProcessingResultsEntity aftersalesProcessingResults = new AftersalesProcessingResultsEntity();
+			aftersalesProcessingResults.setWorkOrderId(aftersalesWorkOrder.getId());
+			//todo 会不会是多个处理结果
+			AftersalesProcessingResultsVO queryProcessing = aftersalesProcessingResultsService.getQueryProcessing(aftersalesProcessingResults);
+			if(ObjectUtils.isNotNull(queryProcessing)){
+				aftersalesWorkOrderVO.setProcessingResultsVO(queryProcessing);
+			}
 		}
 
 		return aftersalesWorkOrderVO;