From 55dffef68aa4c67ab0ca4c2832ac34b9a7671755 Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期三, 13 八月 2025 14:11:57 +0800 Subject: [PATCH] 新增定时任务 --- service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml index ea4823d..1516884 100644 --- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml +++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml @@ -53,10 +53,13 @@ <result property="settlementStatus" column="settlement_status" /> <result property="createTime" column="create_time" /> <result property="updateTime" column="update_time" /> + <result property="isCreate" column="is_create" /> + <result property="billId" column="bill_id" /> + <result property="billId" column="bill_name" /> </resultMap> <sql id="selectPendingSettlementBusinessVo"> - select thisTab.id, thisTab.booking_no, thisTab.customer_id, thisTab.carrier_id, thisTab.project_name, thisTab.dispatch_no, thisTab.created_time, thisTab.transport_mode, thisTab.product_id, thisTab.customer_name, thisTab.operation_mode, thisTab.carrier_name, thisTab.departure_location, thisTab.arrival_location, thisTab.vehicle_id, thisTab.license_plate_number, thisTab.vehicle_type, thisTab.main_driver, thisTab.assistant_driver, thisTab.point_num, thisTab.business_contact, thisTab.estimated_total_income, thisTab.estimated_total_cost, thisTab.estimated_profit, thisTab.electronic_lock, thisTab.re_weighing_weight, thisTab.quantity, thisTab.actual_departure_time, thisTab.required_arrival_time, thisTab.actual_arrival_time, thisTab.be_return, thisTab.dispatch_quantity, thisTab.dispatch_weight, thisTab.dispatch_volume, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.heavy_mileage, thisTab.heavy_fuel, thisTab.be_scheduled, thisTab.tracking_no, thisTab.seal_no, thisTab.schedule_no, thisTab.transport_status, thisTab.estimated_bill_id, thisTab.settlement_bill_id, thisTab.settlement_status, thisTab.create_time, thisTab.update_time from pending_settlement_business AS thisTab + select thisTab.id, thisTab.booking_no, thisTab.customer_id, thisTab.carrier_id, thisTab.project_name, thisTab.dispatch_no, thisTab.created_time, thisTab.transport_mode, thisTab.product_id, thisTab.customer_name, thisTab.operation_mode, thisTab.carrier_name, thisTab.departure_location, thisTab.arrival_location, thisTab.vehicle_id, thisTab.license_plate_number, thisTab.vehicle_type, thisTab.main_driver, thisTab.assistant_driver, thisTab.point_num, thisTab.business_contact, thisTab.estimated_total_income, thisTab.estimated_total_cost, thisTab.estimated_profit, thisTab.electronic_lock, thisTab.re_weighing_weight, thisTab.quantity, thisTab.actual_departure_time, thisTab.required_arrival_time, thisTab.actual_arrival_time, thisTab.be_return, thisTab.dispatch_quantity, thisTab.dispatch_weight, thisTab.dispatch_volume, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.heavy_mileage, thisTab.heavy_fuel, thisTab.be_scheduled, thisTab.tracking_no, thisTab.seal_no, thisTab.schedule_no, thisTab.transport_status, thisTab.estimated_bill_id, thisTab.settlement_bill_id, thisTab.settlement_status, thisTab.create_time, thisTab.update_time, thisTab.is_create, thisTab.bill_name from pending_settlement_business AS thisTab </sql> <sql id="selectPendingSettlementBusinessVoCount"> select count(0) from pending_settlement_business as thisTab @@ -98,6 +101,8 @@ <if test="dispatchVolume != null "> and thisTab.dispatch_volume = #{dispatchVolume}</if> <if test="emptyMileage != null "> and thisTab.empty_mileage = #{emptyMileage}</if> <if test="emptyFuel != null "> and thisTab.empty_fuel = #{emptyFuel}</if> + <if test="isCreate != null "> and thisTab.is_create = #{isCreate}</if> + <if test="billId != null "> and thisTab.bill_id = #{billId}</if> <if test="heavyMileage != null "> and thisTab.heavy_mileage = #{heavyMileage}</if> <if test="heavyFuel != null "> and thisTab.heavy_fuel = #{heavyFuel}</if> <if test="beScheduled != null and beScheduled != ''"> and thisTab.be_scheduled = #{beScheduled}</if> @@ -265,6 +270,10 @@ rt.STATUS = 'ACTIVE' AND rt.NAME = '搴斾粯绾胯矾鏁磋溅浠锋牸' and rtd.REFERENCE1='杩愯垂' </select> + <select id="selectCustomName" resultType="java.lang.String"> + SELECT customer_name from pending_settlement_business group by customer_name + + </select> <!-- 鏂板 --> <insert id="insertPendingSettlementBusiness" parameterType="com.ruoyi.cwgl.domain.PendingSettlementBusiness" useGeneratedKeys="true" keyProperty="id"> @@ -317,6 +326,7 @@ <if test="settlementStatus != null">settlement_status,</if> <if test="createTime != null">create_time,</if> <if test="updateTime != null">update_time,</if> + <if test="isCreate != null">is_create,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="bookingNo != null">#{bookingNo},</if> @@ -366,17 +376,18 @@ <if test="settlementStatus != null">#{settlementStatus},</if> <if test="createTime != null">#{createTime},</if> <if test="updateTime != null">#{updateTime},</if> + <if test="isCreate != null">#{isCreate},</if> </trim> </insert> - <insert id="insertPendingSettlementBusinessBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id"> + <insert id="insertPendingSettlementBusinessBatch" parameterType="java.util.List"> insert into pending_settlement_business <trim prefix="(" suffix=") values" suffixOverrides=","> - id,booking_no,customer_id,carrier_id,project_name,dispatch_no,created_time,transport_mode,product_id,customer_name,operation_mode,carrier_name,departure_location,arrival_location,vehicle_id,license_plate_number,vehicle_type,main_driver,assistant_driver,point_num,business_contact,estimated_total_income,estimated_total_cost,estimated_profit,electronic_lock,re_weighing_weight,quantity,actual_departure_time,required_arrival_time,actual_arrival_time,be_return,dispatch_quantity,dispatch_weight,dispatch_volume,empty_mileage,empty_fuel,heavy_mileage,heavy_fuel,be_scheduled,tracking_no,seal_no,schedule_no,transport_status,estimated_bill_id,settlement_bill_id,settlement_status,create_time,update_time, + booking_no,customer_id,carrier_id,project_name,dispatch_no,created_time,transport_mode,product_id,customer_name,operation_mode,carrier_name,departure_location,arrival_location,vehicle_id,license_plate_number,vehicle_type,main_driver,assistant_driver,point_num,business_contact,estimated_total_income,estimated_total_cost,estimated_profit,electronic_lock,re_weighing_weight,quantity,actual_departure_time,required_arrival_time,actual_arrival_time,be_return,dispatch_quantity,dispatch_weight,dispatch_volume,empty_mileage,empty_fuel,heavy_mileage,heavy_fuel,be_scheduled,tracking_no,seal_no,schedule_no,transport_status,estimated_bill_id,settlement_bill_id,settlement_status,create_time,update_time,is_create, </trim> <foreach item="item" index="index" collection="list" separator=","> <trim prefix="(" suffix=") " suffixOverrides=","> - #{item.id},#{item.bookingNo},#{item.customerId},#{item.carrierId},#{item.projectName},#{item.dispatchNo},#{item.createdTime},#{item.transportMode},#{item.productId},#{item.customerName},#{item.operationMode},#{item.carrierName},#{item.departureLocation},#{item.arrivalLocation},#{item.vehicleId},#{item.licensePlateNumber},#{item.vehicleType},#{item.mainDriver},#{item.assistantDriver},#{item.pointNum},#{item.businessContact},#{item.estimatedTotalIncome},#{item.estimatedTotalCost},#{item.estimatedProfit},#{item.electronicLock},#{item.reWeighingWeight},#{item.quantity},#{item.actualDepartureTime},#{item.requiredArrivalTime},#{item.actualArrivalTime},#{item.beReturn},#{item.dispatchQuantity},#{item.dispatchWeight},#{item.dispatchVolume},#{item.emptyMileage},#{item.emptyFuel},#{item.heavyMileage},#{item.heavyFuel},#{item.beScheduled},#{item.trackingNo},#{item.sealNo},#{item.scheduleNo},#{item.transportStatus},#{item.estimatedBillId},#{item.settlementBillId},#{item.settlementStatus},#{item.createTime},#{item.updateTime}, + #{item.bookingNo},#{item.customerId},#{item.carrierId},#{item.projectName},#{item.dispatchNo},#{item.createdTime},#{item.transportMode},#{item.productId},#{item.customerName},#{item.operationMode},#{item.carrierName},#{item.departureLocation},#{item.arrivalLocation},#{item.vehicleId},#{item.licensePlateNumber},#{item.vehicleType},#{item.mainDriver},#{item.assistantDriver},#{item.pointNum},#{item.businessContact},#{item.estimatedTotalIncome},#{item.estimatedTotalCost},#{item.estimatedProfit},#{item.electronicLock},#{item.reWeighingWeight},#{item.quantity},#{item.actualDepartureTime},#{item.requiredArrivalTime},#{item.actualArrivalTime},#{item.beReturn},#{item.dispatchQuantity},#{item.dispatchWeight},#{item.dispatchVolume},#{item.emptyMileage},#{item.emptyFuel},#{item.heavyMileage},#{item.heavyFuel},#{item.beScheduled},#{item.trackingNo},#{item.sealNo},#{item.scheduleNo},#{item.transportStatus},#{item.estimatedBillId},#{item.settlementBillId},#{item.settlementStatus},#{item.createTime},#{item.updateTime},#{item.isCreate}, </trim> </foreach> </insert> @@ -432,6 +443,7 @@ <if test="settlementStatus != null">settlement_status = #{settlementStatus},</if> <if test="createTime != null">create_time = #{createTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if> + <if test="isCreate != null">is_create = #{isCreate},</if> </trim> where id = #{id} </update> @@ -487,6 +499,7 @@ <if test="item.settlementStatus != null">settlement_status = #{item.settlementStatus},</if> <if test="item.createTime != null">create_time = #{item.createTime},</if> <if test="item.updateTime != null">update_time = #{item.updateTime},</if> + <if test="item.isCreate != null">is_create = #{item.isCreate},</if> </trim> where id = #{item.id} </foreach> @@ -499,6 +512,15 @@ </foreach> </update> + <update id="updatePendingSettlementBusinessIsCreate"> + + UPDATE pending_settlement_business + SET is_create = 1 ,bill_id = #{id},bill_name = #{billName} + WHERE dispatch_no IN + <foreach item="item" collection="list" open="(" separator="," close=")"> + #{item} + </foreach> + </update> <!--鍒犻櫎--> <delete id="deletePendingSettlementBusinessById" parameterType="Integer"> -- Gitblit v1.8.0