From a6430ffc4448d79a95fb28f1ac464f0f35f2a10c Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 02 七月 2025 11:00:03 +0800 Subject: [PATCH] art:点检工单、点检标准数据库设计修改 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java index 32f01e6..12b413b 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java @@ -30,8 +30,6 @@ * @Description: 璁惧鍔犵彮鏃堕暱绠楁硶缁熻 * @date 2024/1/24 17:12 */ -@PersistJobDataAfterExecution -@DisallowConcurrentExecution @Slf4j public class RunningOvertimeDurationJob implements Job { @@ -90,7 +88,7 @@ } else { date = DateUtils.format(DateUtils.getNow(), DateUtils.STR_DATE); } - List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<>()); + List<MdcEquipment> equipmentList = mdcEquipmentService.list(); MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time")); if (mdcSystemParameters == null) { throw new JobExecutionException("mdc_system_parameters 琛ㄤ腑鏁版嵁缂哄け"); @@ -128,7 +126,7 @@ } else { // 娌℃湁鐝閰嶇疆锛岃绠楀叏澶╃殑璁惧鍔犲伐鐘舵�� Date startDate = DateUtils.toDate(date + " " + value, DateUtils.STR_DATE_TIME_SMALL); - Date endDate = DateUtils.plusTime(startDate, 1); + Date endDate = DateUtils.plusTime(startDate, 1); List<MdcEquipmentRunningSection> equipmentRunningSectionList = mdcEquipmentRunningSectionService.selectRunningData(mdcEquipment.getEquipmentId(), startDate, endDate); if (equipmentRunningSectionList != null && !equipmentRunningSectionList.isEmpty()) { // 鏃堕棿淇 -- Gitblit v1.9.3