From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 b4a5334..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
@@ -40,7 +40,6 @@
public void screenHome() {
JSONObject jsonObject = new JSONObject();
Reportingdamage reportingdamage = new Reportingdamage();
- //reportingdamage.setReportingWorkTime("2024-05-11");
// 鑾峰彇褰撳墠鏃ユ湡
LocalDate today = LocalDate.now();
// 璁＄畻鏈�杩戜竷澶╃殑寮�濮嬫棩鏈�
@@ -52,8 +51,9 @@
String startOfPeriodStr = startOfPeriod.format(formatter);
String endOfPeriodStr = endOfPeriod.format(formatter);
// 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
- reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
- //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
+// reportingdamage.setReportingWorkTime("2024-05-11");
+ reportingdamage.setReportingWorkTime(startOfPeriodStr);
+ reportingdamage.setReportingWorkTime2(endOfPeriodStr);
//鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
jsonObject.append("device", device);
--
Gitblit v1.8.0