From a70c4bfde4a52a598a270901e41b8c253dd0bb89 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 04 七月 2025 21:02:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java
index 17ae5d6..be828db 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java
@@ -82,9 +82,9 @@
                     standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1)));
                 }
                 LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate());
-                if (standard.getLastGenerateTime() != null) {
-                    generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime());
-                }
+//                if (standard.getLastGenerateTime() != null) {
+//                    generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime());
+//                }
                 //鍔犲懆鏈�
                 do {
                     //鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
@@ -122,7 +122,7 @@
                 request.setTableDetailList(tableDetailList);
                 eamSecondMaintenanceOrderService.addMaintenance(request);
 
-                standard.setLastGenerateTime(new Date());
+//                standard.setLastGenerateTime(new Date());
                 eamMaintenanceStandardService.updateById(standard);
             }
             quartzLog.setIsSuccess(0);

--
Gitblit v1.9.3