From 04f3b1c3cdab80467807dc192aa9b8528ec8edbc Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 21 Feb 2024 17:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B7=A5=E5=8D=95=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/AftersalesWorkOrderMapper.xml | 18 +++++++++---------
.../impl/AftersalesWorkOrderServiceImpl.java | 3 +++
2 files changed, 12 insertions(+), 9 deletions(-)
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 70b62a7a3..3b8bfca27 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
@@ -122,11 +122,10 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.waybill_mall like concat('%', #{param.waybillMall },'%')
and lawo.delivery_driver = #{param.deliveryDriver }
and lawo.work_order_status in ('40')
-
-
+ and lawo.work_order_status in ('20')
and lawo.work_order_status in ('30')
- and lawo.work_order_status in ('30')
- and lawo.work_order_status in ('80','100')
+ and lawo.work_order_status in ('30')
+ and lawo.work_order_status in ('70')
and lawo.customer_service_id = #{param.customerServiceId }
and lawo.customer_service_name like concat('%', #{param.customerServiceName },'%')
and lawo.waybill_mall_id = #{param.waybillMallId }
@@ -147,7 +146,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId}
- or 1=1
+ or 1=1
and lawo.work_order_type = #{param.workOrderType }
and lawo.discovery_node = #{param.discoveryNode }
and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')
@@ -160,11 +159,12 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lap.business_id = #{param.warehouseId}
and lawo.work_order_status in ( #{param.workOrderStatus })
- and lawo.work_order_status in ('10','20' ) and lap.types_of = '2' and lap.processing_status in ('1')
- and lap.types_of = '2'
- and lawo.work_order_status in (21,30,40) and lap.processing_status = '4'
+ and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1')
+ and lawo.work_order_status in ('30') and lap.types_of = '2' and lap.processing_status in ('1')
+ and lap.types_of = '2'
+ and lawo.work_order_status in (21,30) and lap.processing_status = '4'
and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId}
- and lawo.work_order_status in (20,30,10,40,60,100,21,70)
+ and lawo.work_order_status in ('10')
ORDER BY lawo.create_time DESC
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 e177dd349..a342b5846 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
@@ -713,6 +713,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl