From e6a25dfa55101ca8b684eea2ae447e6e5c1e59d7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 03 九月 2024 15:37:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
index f8df5ef..2a52753 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -51,8 +51,8 @@
String startOfPeriodStr = startOfPeriod.format(formatter);
String endOfPeriodStr = endOfPeriod.format(formatter);
// 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
- reportingdamage.setReportingWorkTime("2024-05-11");
- //reportingdamage.setReportingWorkTime("2024-05-11");
+// reportingdamage.setReportingWorkTime("2024-05-11");
+ reportingdamage.setReportingWorkTime(startOfPeriodStr);
reportingdamage.setReportingWorkTime2(endOfPeriodStr);
//鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
--
Gitblit v1.8.0