修改签收复合的问题

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java

@@ -43,6 +43,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
 
+
+	/**
+	 * 签收ID
+	 */
+	private Long signId;
 	/**
 	 * 运单号
 	 */
@@ -344,6 +349,9 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 * 签收时间
 	 */
 	private String signingTime;
+
+
+
 //	/**
 //	 * 配送方式
 //	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -65,6 +65,7 @@
         SELECT
         ldr.reservation_num,
         ldr.id id,
+        lds.id signId,
         ldr.is_urgent isUrgent,
         ldr.mall_name mallName,
         ldr.reservation_code reservationCode,
@@ -561,6 +562,7 @@ FROM
         SELECT
         ldr.reservation_num,
         ldr.id id,
+        lds.id signId,
         ldr.is_urgent isUrgent,
         ldr.mall_name mallName,
         ldr.reservation_code reservationCode,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java

@@ -124,7 +124,6 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
     DistributionSignforVO selectOneCustom(@Param("id")Long id);
-    DistributionSignforVO selectOneCustomByReservationId(@Param("id")Long id);
 	/**
 	 * 查询车次装车件数
 	 *

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -663,60 +663,7 @@
     </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>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1050,7 +1050,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public DistributionSignforVO getOneCustom(Long id) {
 		// todo  这里需要配TJJ 来进行修改 传入的参数未预约单DI
-		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustomByReservationId(id);
+		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
 		//查询客户下的订单列表信息
 		DistributionSignforEntity signforEntity = this.getById(id);
 		if (Func.isEmpty(signforEntity)) {