新增时间范围查询

wujianwei

2025-09-28 5fb3c5b006a75633d78f0ada8757c45c391055d4

 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
@@ -44,9 +45,10 @@
        <if test="driverName != null  and driverName != ''"> and  thisTab.driver_name like concat('%', #{driverName}, '%')</if>
        <if test="driverMobile != null  and driverMobile != ''"> and thisTab.driver_mobile = #{driverMobile}</if>
        <if test="licensePlateNumber != null  and licensePlateNumber != ''"> and thisTab.license_plate_number = #{licensePlateNumber}</if>
        <if test="orderTime != null "> and thisTab.order_time = #{orderTime}</if>
        <if test="orderCreatedTime != null "> and thisTab.order_created_time = #{orderCreatedTime}</if>
        <if test="dispatchCreatedTime != null "> and thisTab.dispatch_created_time = #{dispatchCreatedTime}</if>
        <if test="orderTimeBegin != null and orderTimeBegin!='' and orderTimeEnd != null and orderTimeEnd!='' "> and thisTab.order_time between #{orderTimeBegin} and #{orderTimeEnd}</if>
        <if test="orderCreatedTimeBegin != null and orderCreatedTimeBegin!='' and orderCreatedTimeEnd != null and orderCreatedTimeEnd!='' "> and thisTab.order_created_time between #{orderCreatedTimeBegin} and #{orderCreatedTimeEnd}</if>
        <if test="dispatchCreatedTimeBegin != null and dispatchCreatedTimeBegin!='' and dispatchCreatedTimeEnd != null and dispatchCreatedTimeEnd!='' "> and thisTab.dispatch_created_time between #{dispatchCreatedTimeBegin} and #{dispatchCreatedTimeEnd}</if>

        <if test="keyCollectionTime != null "> and thisTab.key_collection_time = #{keyCollectionTime}</if>
        <if test="estimatedDepartureTime != null "> and thisTab.estimated_departure_time = #{estimatedDepartureTime}</if>
        <if test="requiredArrivalTime != null "> and thisTab.required_arrival_time = #{requiredArrivalTime}</if>
@@ -105,8 +107,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 +159,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 +184,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>