From f50644960399b39998daf15905331daa3ea5b8fd Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Fri, 15 Dec 2023 14:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=8C=E7=BB=93=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AftersalesSettlementEntity.java    |  5 +++++
 .../AftersalesWorkOrderController.java        |  2 +-
 .../mapper/AftersalesWorkOrderMapper.xml      |  4 ++--
 .../impl/AftersalesWorkOrderServiceImpl.java  | 19 ++++++++++++++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesSettlementEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesSettlementEntity.java
index fd7eba854..33463b8b0 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesSettlementEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesSettlementEntity.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author 12702
@@ -61,6 +62,10 @@ public class AftersalesSettlementEntity extends TenantEntity {
  private String workOrderStatus;
 	//工单状态名称
  private String workOrderStatusName;
+	/**
+	 * 完结时间
+	 */
+ private Date overTime;
 
 
 
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index e2a6a8b0b..31485a653 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -168,7 +168,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@XxlJob("modifyClaimStatus")
 //	@Scheduled(cron = "0 0/1 * * * ?")
 	public void updateModifyClaimStatus() {
-		log.info("查询处理超时的数据>>>>>>>>");
+		log.info("修改理赔工单是否可以申述>>>>>>>>");
 		  aftersalesWorkOrderService.updateModifyClaimStatus();
 	}
 
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index ab7dc09fc..a630adcad 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -143,10 +143,10 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         select las.work_order_number workOrderNumber,las.business_name businessName,las.brand_name brandName,las.mall_name mallName,las.waybill_number waybillNumber,
                las.work_order_type workOrderType,las.result_type resultType,las.laprId,  las.discovery_node discoveryNode, las.result_description resultDescription,
                las.vehicle_route vehicleRoute,las.indemnitor,las.reason,las.money,las.lawoId,las.create_time createTime,las.process_number processNumber,
-               las.work_order_status workOrderStatus
+               las.work_order_status workOrderStatus,las.over_time overTime,las.business_id businessId
         from logpm_aftersales_settlement   las
         <where>
-
+            <if test="param.businessId != null  "> and las.business_id = #{ param.businessId }</if>
         </where>
     </select>
     <select id="getListSettlement" resultType="com.logpm.aftersales.entity.AftersalesSettlementEntity">
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 4b1974ce0..41f5987ba 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
@@ -383,6 +383,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			return false;
 		}
 		aftersalesWorkOrder.forEach(v ->{
+			if(ObjectUtils.isNull(v.getId())){
+				throw new ServiceException("异常工单ID不能为空！");
+			}
 			if(ObjectUtils.isNull(v.getCompletionRecordEntities()) ){
 				throw new ServiceException("赔款方数据不能为空");
 			}
@@ -392,6 +395,13 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if(ObjectUtils.isNotNull(v.getCompletionRecipientEntities())){
 				completionRecipientService.saveBatch(v.getCompletionRecipientEntities());
 			}
+			//修改工单异常完结状态
+			AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+			workOrderEntity.setId(v.getId());
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue());
+			workOrderEntity.setOverTime(new Date());
+			baseMapper.updateById(workOrderEntity);
+
 			//添加跟踪记录
 			AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
 			AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(v, user);
@@ -990,7 +1000,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			//修改工单状态
 			AftersalesWorkOrderEntity aftersalesWorkOrderEntity = new AftersalesWorkOrderEntity();
 			aftersalesWorkOrderEntity.setId(l);
-			aftersalesWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue());
+			aftersalesWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue());\
+			aftersalesWorkOrderEntity.setOverTime(new Date());
 			baseMapper.updateById(aftersalesWorkOrderEntity);
 			//修改
 			UpdateWrapper<AftersalesArbitrationOrderEntity> lambdaUpdateWrapper = new UpdateWrapper<>();
@@ -999,7 +1010,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			lambdaUpdateWrapper.set("types_of",WorkOrderTypesOfStatusConstant.jeishu.getValue());
 			aftersalesArbitrationOrderService.update(lambdaUpdateWrapper);
 
-
 			//添加跟踪记录
 			AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
 			AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(aftersalesWorkOrder, user);
@@ -1009,7 +1019,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			surveyRecordEntity.setWorkOrderId(l);
 			surveyRecordEntity.setProcessingResults("客服仲裁完结");
 			aftersaleSurveyRecordService.save(surveyRecordEntity);
-
 		}
 
 		return true;
@@ -1280,7 +1289,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	@Override
 	public void updateModifyClaimStatus() {
 		List<AftersalesSettlementEntity> settlementEntityList = baseMapper.getWholeListSettlement();
+		if(!settlementEntityList.isEmpty()){
+			settlementEntityList.forEach(i ->{
 
+			});
+		}
 
 	}