From 6484c3727272401fe5e3c56e565eb1e8a42c4971 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Fri, 15 Dec 2023 11:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWorkOrderController.java        |  2 +-
 .../mapper/AftersalesWorkOrderMapper.java     |  6 ++
 .../mapper/AftersalesWorkOrderMapper.xml      | 58 ++++++++++---------
 .../service/IAftersalesWorkOrderService.java  |  5 ++
 .../impl/AftersalesWorkOrderServiceImpl.java  | 14 ++++-
 5 files changed, 55 insertions(+), 30 deletions(-)

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 656ce422f..e2a6a8b0b 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
@@ -169,7 +169,7 @@ public class AftersalesWorkOrderController extends BladeController {
 //	@Scheduled(cron = "0 0/1 * * * ?")
 	public void updateModifyClaimStatus() {
 		log.info("查询处理超时的数据>>>>>>>>");
-		  aftersalesWorkOrderService.getIsItTimeout();
+		  aftersalesWorkOrderService.updateModifyClaimStatus();
 	}
 
 
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java
index 45267ac67..262cde433 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java
@@ -78,4 +78,10 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 * @return
 	 */
 	IPage<AftersalesSettlementEntity> getListSettlement(IPage<Object> page,@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity);
+
+	/**
+	 * 查询是否可以申述
+	 * @return
+	 */
+	List<AftersalesSettlementEntity> getWholeListSettlement();
 }
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 754ac2d4a..ab7dc09fc 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
@@ -139,36 +139,40 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         </where>
 
     </select>
+    <select id="getWholeListSettlement" resultType="com.logpm.aftersales.entity.AftersalesSettlementEntity">
+        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
+        from logpm_aftersales_settlement   las
+        <where>
+
+        </where>
+    </select>
     <select id="getListSettlement" resultType="com.logpm.aftersales.entity.AftersalesSettlementEntity">
-        select lawo.work_order_number workOrderNumber,lap.business_name businessName,ldpl.brand_name brandName,ldsa.mall_name mallName,laap.waybill_number waybillNumber,
-               lawo.work_order_type workOrderType,lapr.result_type resultType,lapr.id  laprId,  lawo.discovery_node discoveryNode, lapr.result_description resultDescription,
-               lawo.vehicle_route vehicleRoute,lacr.indemnitor,lacr.reason,lacr.money,lawo.id lawoId,lawo.create_time createTime,lawo.process_number processNumber,
-               lawo.work_order_status workOrderStatus
-        from logpm_aftersales_processor lap
-                 LEFT JOIN logpm_aftersales_processing_results lapr on lapr.work_order_id = lap.work_order_id
-                 LEFT JOIN logpm_aftersales_completion_record lacr on lacr.work_order_id = lapr.work_order_id
-                 LEFT JOIN logpm_aftersales_work_order lawo on lawo.id = lapr.work_order_id
-                 LEFT JOIN logpm_aftersales_abnormal_package laap on laap.work_order_id = lawo.id
-                 LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.order_package_code =laap.package_code and ldpl.waybill_number = laap.waybill_number
-                 LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
+        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
+          from logpm_aftersales_settlement   las
         <where>
             lap.processing_status = '4' and lap.is_deleted = 0
-            <if test="param.businessId != null  "> and lap.business_id = #{param.businessId }</if>
-            <if test="param.businessName != null and param.businessName != '' "> and lap.business_name = #{param.businessName }</if>
-            <if test="param.workOrderNumber != null and param.workOrderNumber != '' "> and lawo.work_order_number = #{param.workOrderNumber }</if>
-            <if test="param.businessName != null and param.businessName != '' "> and lap.business_name = #{param.businessName }</if>
-            <if test="param.brandName != null and param.brandName != '' "> and ldpl.brand_name = #{param.brandName }</if>
-            <if test="param.mallName != null and param.mallName != '' "> and ldsa.mall_name = #{param.mallName }</if>
-            <if test="param.waybillNumber != null and param.waybillNumber != '' "> and laap.waybill_number = #{param.waybillNumber }</if>
-            <if test="param.workOrderType != null and param.workOrderType != '' "> and lawo.work_order_type = #{param.workOrderType }</if>
-            <if test="param.resultType != null and param.resultType != '' "> and lapr.result_type = #{param.resultType }</if>
-            <if test="param.discoveryNode != null and param.discoveryNode != '' "> and lawo.discovery_node = #{param.discoveryNode }</if>
-            <if test="param.resultDescription != null and param.resultDescription != '' "> and lapr.result_description = #{param.resultDescription }</if>
-            <if test="param.vehicleRoute != null and param.vehicleRoute != '' "> and lawo.vehicle_route = #{param.vehicleRoute }</if>
-            <if test="param.indemnitor != null and param.indemnitor != '' "> and lacr.indemnitor = #{param.indemnitor }</if>
-            <if test="param.reason != null and param.reason != '' "> and lacr.reason = #{param.reason }</if>
-            <if test="param.createTime != null and param.createTime != '' "> and date_format(from_unixtime(lawo.create_time),'%Y-%m-%d') = date_format(#{param.createTime}),'%Y-%m-%d')  </if>
-            <if test="param.processNumber != null and param.processNumber != '' "> and lawo.process_number = #{param.processNumber }</if>
+            <if test="param.businessId != null  "> and las.business_id = #{param.businessId }</if>
+            <if test="param.businessName != null and param.businessName != '' "> and las.business_name = #{param.businessName }</if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != '' "> and las.work_order_number = #{param.workOrderNumber }</if>
+            <if test="param.businessName != null and param.businessName != '' "> and las.business_name = #{param.businessName }</if>
+            <if test="param.brandName != null and param.brandName != '' "> and las.brand_name = #{param.brandName }</if>
+            <if test="param.mallName != null and param.mallName != '' "> and las.mall_name = #{param.mallName }</if>
+            <if test="param.waybillNumber != null and param.waybillNumber != '' "> and las.waybill_number = #{param.waybillNumber }</if>
+            <if test="param.workOrderType != null and param.workOrderType != '' "> and las.work_order_type = #{param.workOrderType }</if>
+            <if test="param.resultType != null and param.resultType != '' "> and las.result_type = #{param.resultType }</if>
+            <if test="param.discoveryNode != null and param.discoveryNode != '' "> and las.discovery_node = #{param.discoveryNode }</if>
+            <if test="param.resultDescription != null and param.resultDescription != '' "> and las.result_description = #{param.resultDescription }</if>
+            <if test="param.vehicleRoute != null and param.vehicleRoute != '' "> and las.vehicle_route = #{param.vehicleRoute }</if>
+            <if test="param.indemnitor != null and param.indemnitor != '' "> and las.indemnitor = #{param.indemnitor }</if>
+            <if test="param.reason != null and param.reason != '' "> and las.reason = #{param.reason }</if>
+            <if test="param.createTime != null and param.createTime != '' "> and date_format(from_unixtime(las.create_time),'%Y-%m-%d') = date_format(#{param.createTime}),'%Y-%m-%d')  </if>
+            <if test="param.processNumber != null and param.processNumber != '' "> and las.process_number = #{param.processNumber }</if>
         </where>
 
     </select>
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java
index 7dfc2bbd0..c819b0c3d 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java
@@ -229,4 +229,9 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	boolean updateCompletionEnd(AftersalesWorkOrderDTO aftersalesWorkOrder);
+
+	/**
+	 * 修改是否可以申述
+	 */
+	void updateModifyClaimStatus();
 }
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 6379c5e47..4b1974ce0 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
@@ -441,7 +441,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 					case "2": // 营业部客服
 						BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 						if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-							aftersalesWorkOrder.put("businessId", myCurrentWarehouse.getId());
+							aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
 						}else{
 							throw new ServiceException("请选择仓库！");
 						}
@@ -455,7 +455,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				//不存在
 				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 				if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-					aftersalesWorkOrder.put("businessId", myCurrentWarehouse.getId());
+					aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
 				}else{
 					throw new ServiceException("请选择仓库！");
 				}
@@ -1274,6 +1274,16 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		return true;
 	}
 
+	/**
+	 * 修改是否可以申述的状态
+	 */
+	@Override
+	public void updateModifyClaimStatus() {
+		List<AftersalesSettlementEntity> settlementEntityList = baseMapper.getWholeListSettlement();
+
+
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO