From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 20 十一月 2024 18:48:23 +0800 Subject: [PATCH] 1、基于Timer实现定时执行的任务,并在满足条件下结束定时任务,为此实现抽象类TimerTaskJob类,并在UpgradeManager类中应用; 2、TreadJob类由TimerTaskJob替换,弃用TreadJob类。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml index cbbad3c..ec4f68d 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml @@ -504,7 +504,7 @@ oh.op_ic_card_no AS openIcNum, oh.op_ic_card_addr AS openIcAddr, oh.open_dt AS openTime, - oh.op_type AS openType_, + oh.op_type AS opType, oh.op_order_no AS openOrderNo, oh.op_total_amount AS openTotalAmount, oh.op_remain_money AS openRemainMoney, @@ -513,7 +513,7 @@ oh.cl_ic_card_no AS closeIcNum, oh.cl_ic_card_addr AS closeIcAddr, oh.close_dt AS closeTime, - oh.cl_type AS closeType_, + oh.cl_type AS clType, oh.cl_this_amount AS closeThisAmount, oh.cl_this_time AS thisTime, oh.cl_price AS closePrice, @@ -522,7 +522,7 @@ oh.cl_total_amount AS closeTotalAmount FROM rm_open_close_valve_last oh LEFT JOIN pr_intake inta ON inta.id = oh.intake_id - LEFT JOIN ba_client cl ON cl.id = oh.client_id + LEFT JOIN se_client cl ON cl.id = oh.client_id <where> <if test="intakeId != null and intakeId > 0"> AND oh.intake_id = #{intakeId} -- Gitblit v1.8.0