From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 08 五月 2025 21:10:42 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java index 8491229..5d6381d 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java @@ -19,6 +19,11 @@ public class QoCommand extends QueryConditionVo { /** + * 鍙栨按鍙D + */ + private Long intakeId; + + /** * 鍛戒护鍚嶇О */ private String commandName; @@ -34,7 +39,18 @@ private String timeStart; /** - * 鏌ヨ鎴鏃堕棿 + * 鏌ヨ缁撴潫鏃堕棿 */ private String timeStop; + + + public void completionTime(){ + if(timeStart != null && !timeStart.trim().equals("")) { + timeStart = timeStart + " 00:00:00"; + } + if(timeStop != null && !timeStop.trim().equals("")) { + timeStop = timeStop + " 23:59:59"; + } + + } } -- Gitblit v1.8.0