From 12e7649c8306dfa8b3c7c8f73bba1109d49ddbbe Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 27 Dec 2023 15:17:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6=E5=A4=8D?=
 =?UTF-8?q?=E5=90=88=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionSignforMapper.java     |  1 +
 .../mapper/DistributionSignforMapper.xml      | 56 +++++++++++++++++++
 .../impl/DistributionSignforServiceImpl.java  |  2 +-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index 8d6629a93..7c36f4079 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -124,6 +124,7 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
     DistributionSignforVO selectOneCustom(@Param("id")Long id);
+    DistributionSignforVO selectOneCustomByReservationId(@Param("id")Long id);
 	/**
 	 * 查询车次装车件数
 	 *
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index c6a3511a2..4268f736f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -661,6 +661,62 @@
                 JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         where lds.is_deleted = 0 and lds.id = #{id}
     </select>
+
+
+    <select id="selectOneCustomByReservationId" resultType="com.logpm.distribution.vo.DistributionSignforVO">
+        SELECT
+        CASE
+        WHEN
+        ldr.is_urgent = '1' THEN '否'
+        WHEN ldr.is_urgent = '2' THEN '是'
+        ELSE ''
+        END isUrgent,
+        ldr.reservation_code reservationCode,
+        ldr.mall_name mallName,
+        ldr.consignee consignee,
+        ldr.remarks remarks,
+        ldr.delivery_address deliveryAddress,
+        ldr.delivery_phone deliveryPhone,
+        lds.clerk_sign_remarks clerkSignRemarks,
+        lds.driver_remarks driverRemarks,
+        lds.signing_status AS wenyuanSigningStatus,
+        lds.driver_signing AS sijiSigningStatus,
+        lds.reservation_id reservationId,
+        lds.signing_type signingType,
+        lds.clerk_sign_pictures clerkSignPictures,
+        lds.delivery_sign_pictures deliverySignPictures,
+        ldr.reservation_date reservationDate,
+        lds.positioning_adr positioningAdr,
+        lddl.train_number trainNumber,
+        lddl.vehicle_name vehicleName,
+        lddl.driver_name driverName,
+        lddl.driver_name driverName,
+        lddl.loading_team_name loadingTeamName,
+        lddl.unloading_team_name unLoadingTeamName,
+        CASE
+        WHEN ldr.delivery_type = '1' THEN
+        '商配'
+        WHEN ldr.delivery_type = '2' THEN
+        '市配'
+        END deliveryType,
+        CASE
+        WHEN lds.signing_status = '1' THEN
+        '文员待审核'
+        WHEN lds.signing_status = '2' THEN
+        '文员已审核'
+        END signingStatusName,
+        CASE
+        WHEN lds.driver_signing = '1' THEN
+        '司机待审核'
+        WHEN lds.driver_signing = '2' THEN
+        '司机已签收'
+        END driverSigningName
+        FROM
+        logpm_distribution_signfor lds
+        JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        where lds.is_deleted = 0 and ldr.id = #{id}
+    </select>
     <select id="selectloadNub" resultType="java.lang.Integer">
         SELECT COALESCE(sum(lds.loaded_number), 0)  FROM logpm_distribution_signfor lds WHERE lds.delivery_id = #{id}
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index a163b5cc6..ac9856f45 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1049,7 +1049,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public DistributionSignforVO getOneCustom(Long id) {
-		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
+		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustomByReservationId(id);
 		//查询客户下的订单列表信息
 		DistributionSignforEntity signforEntity = this.getById(id);
 		if (Func.isEmpty(signforEntity)) {