From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 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 3c42552..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 {
 
@@ -79,8 +77,8 @@
         quartzLog.setParams(this.parameter);
         log.info(String.format("瀹氭椂缁熻璁惧鍔犵彮鏃堕暱浠诲姟 param: %s RunningOvertimeDurationJob start!  鏃堕棿:" + DateUtils.getNow(), this.parameter));
         long startTime = System.currentTimeMillis();
+        String date = "";
         try {
-            String date = "";
             if (StringUtils.isNotBlank(this.parameter)) {
                 date = DateUtils.format(DateUtils.toDate(this.parameter, DateUtils.STRDATE), DateUtils.STR_DATE);
                 Date initDate = DateUtils.toDate(this.parameter, DateUtils.STRDATE);
@@ -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 琛ㄤ腑鏁版嵁缂哄け");
@@ -99,7 +97,7 @@
             List<MdcEquipmentOvertime> result = new ArrayList<>();
             for (MdcEquipment mdcEquipment : equipmentList) {
                 // 鑾峰彇璁惧宸ヤ綔鏃ュ巻
-                List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = mdcDeviceCalendarService.listByEquipmentIdAndDate(mdcEquipment.getEquipmentId(), this.parameter);
+                List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = mdcDeviceCalendarService.listByEquipmentIdAndDate(mdcEquipment.getEquipmentId(), DateUtils.format(DateUtils.toDate(date, DateUtils.STR_DATE),DateUtils.STRDATE));
                 if (mdcDeviceCalendarVos != null && !mdcDeviceCalendarVos.isEmpty()) {
                     //鑾峰彇鏈�鍚庝竴涓彮娆$粨鏉熸椂闂�
                     Date startDate = this.getCalendarEndDate(mdcDeviceCalendarVos, date);
@@ -121,14 +119,14 @@
                         mdcEquipmentOvertime.setEquipmentId(mdcEquipment.getEquipmentId());
                         mdcEquipmentOvertime.setDuration(duration);
                         mdcEquipmentOvertime.setAutoFlag(CommonConstant.AUTO_FLAG_Y);
-                        mdcEquipmentOvertime.setTheDate(this.parameter);
+                        mdcEquipmentOvertime.setTheDate(DateUtils.format(DateUtils.toDate(date, DateUtils.STR_DATE),DateUtils.STRDATE));
                         result.add(mdcEquipmentOvertime);
                     }
 
                 } 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()) {
                         // 鏃堕棿淇
@@ -146,7 +144,7 @@
                         mdcEquipmentOvertime.setEquipmentId(mdcEquipment.getEquipmentId());
                         mdcEquipmentOvertime.setDuration(duration);
                         mdcEquipmentOvertime.setAutoFlag(CommonConstant.AUTO_FLAG_Y);
-                        mdcEquipmentOvertime.setTheDate(this.parameter);
+                        mdcEquipmentOvertime.setTheDate(DateUtils.format(DateUtils.toDate(date, DateUtils.STR_DATE),DateUtils.STRDATE));
                         result.add(mdcEquipmentOvertime);
                     }
 

--
Gitblit v1.9.3