From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
index 8f44dfe..7f5862a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
@@ -35,7 +35,7 @@
* @return
*/
public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
-
+ vo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -54,6 +54,7 @@
* @return
*/
public QueryResultVo<List<VoControllerAlarmState>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
+ vo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -74,7 +75,7 @@
* @return
*/
public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateLast(ControllerAlarmStateQueryVo vo) {
-
+ vo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
Long itemTotal = rmAlarmStateLastMapper.getRecordCount(params);
--
Gitblit v1.8.0