service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java

@@ -95,6 +95,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("estimated_departure_time")
    private Date estimatedDepartureTime;
   /** 预计出发时间 */
    @Excel(name = "要求出发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("required_departure_time")
    private Date requiredDepartureTime;


    /** 要求到达时间 */

 service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java

@@ -214,7 +214,7 @@
        }
        Integer keyTimeout = keyCollectionInfo.getKeyTimeout();
        if (keyTimeout!=null && keyTimeout>24){
            Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
            Date estimatedDepartureTime = keyCollectionInfo.getRequiredDepartureTime();
            String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
            logger.info("要求出发时间"+ dateToStr+"，领取钥匙超时"+keyTimeout+"个小时");
            return AjaxResult.error("要求出发时间"+ dateToStr+"，领取钥匙超时"+keyTimeout+"个小时");

 service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml

@@ -28,10 +28,11 @@
        <result property="dispatchQuantity"    column="dispatch_quantity"    />
        <result property="remark"    column="remark"    />
        <result property="boxNum"    column="box_num"    />
        <result property="requiredDepartureTime"    column="required_departure_time"    />
    </resultMap>

    <sql id="selectKeyCollectionInfoVo">
        select thisTab.id, thisTab.customer_name, thisTab.carrier, thisTab.dispatch_no, thisTab.driver_name, thisTab.driver_mobile, thisTab.license_plate_number, thisTab.order_time, thisTab.order_created_time, thisTab.dispatch_created_time, thisTab.key_collection_time, thisTab.estimated_departure_time, thisTab.required_arrival_time, thisTab.consignor_address, thisTab.consignee_address, thisTab.main_driver, thisTab.point_num, thisTab.transport_mode, thisTab.assistant_driver, thisTab.quantity, thisTab.dispatch_quantity, thisTab.remark, thisTab.box_num from key_collection_info AS thisTab
        select thisTab.id, thisTab.customer_name, thisTab.carrier, thisTab.dispatch_no, thisTab.driver_name, thisTab.driver_mobile, thisTab.license_plate_number, thisTab.order_time, thisTab.order_created_time, thisTab.dispatch_created_time, thisTab.key_collection_time, thisTab.estimated_departure_time, thisTab.required_arrival_time, thisTab.consignor_address, thisTab.consignee_address, thisTab.main_driver, thisTab.point_num, thisTab.transport_mode, thisTab.assistant_driver, thisTab.quantity, thisTab.dispatch_quantity, thisTab.remark, thisTab.box_num , thisTab.required_departure_time from key_collection_info AS thisTab
    </sql>
    <sql id="selectKeyCollectionInfoVoCount">
        select count(0) from key_collection_info as thisTab
@@ -105,8 +106,9 @@
        ts.REQUIRED_ARRIVAL_TIME as requiredArrivalTime,  -- 添加别名
        ts.DISPATCH_QUANTITY as dispatchQuantity,
        ts.REMARK as remark,
        ts.REQUIRED_DEPARTURE_TIME as requiredDepartureTime ,
        TIMESTAMPDIFF(HOUR, ord.ORDER_TIME, ord.CREATED_TIME) as schedulingTimeout,
        TIMESTAMPDIFF(HOUR, ord.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout
        TIMESTAMPDIFF(HOUR, ts.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout

        FROM
        tms_shipment ts
@@ -156,6 +158,7 @@
            <if test="dispatchQuantity != null">dispatch_quantity,</if>
            <if test="remark != null">remark,</if>
            <if test="boxNum != null">box_num,</if>
            <if test="requiredDepartureTime != null">required_departure_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="customerName != null">#{customerName},</if>
@@ -180,6 +183,7 @@
            <if test="dispatchQuantity != null">#{dispatchQuantity},</if>
            <if test="remark != null">#{remark},</if>
            <if test="boxNum != null">#{boxNum},</if>
            <if test="requiredDepartureTime != null">#{requiredDepartureTime},</if>
         </trim>
    </insert>