From e8937f27fce194d015ce6c27d286e7fc89f5e580 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 17:29:47 +0800
Subject: [PATCH] 查询开关阀记录相关修改
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
index a2f274c..1c1afe7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -1,6 +1,6 @@
package com.dy.pipIrrRemote.report;
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
@@ -90,7 +90,12 @@
* @return
*/
public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
- qo.completionTimeNoEmpty() ;
+ //涓嬮潰鐢眂ompletionTimeNoEmpty()鏀逛负completionTime()鍘熷洜锛�
+ //寮�鍏抽榾璁板綍涓紑闃�鏃堕棿鍜屽叧闃�鏃堕棿鏈夋椂涓嶄細鍚屾椂鏈夊�硷紝鍙兘鍏朵腑浠讳竴涓槸null鍊硷紝濡傛灉鐢ㄦ椂闂存潯浠舵煡璇紝鍒欒繖鏍风殑璁板綍灏辨煡涓嶅嚭鏉ヤ簡銆�
+ //濡傛灉瑕佺缉灏忔墍鏌ヨ璁板綍鐨勮寖鍥达紙鏁伴噺锛夛紝鍒欏彲浠庤褰旾D涓婅澶囦竴涓寖鍥淬��
+ //qo.completionTimeNoEmpty() ;
+ qo.completionTime() ;
+
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
@@ -103,8 +108,12 @@
List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
- vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
- vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ if(vo.getClType() != null) {
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType() == null ? (byte) 100 : vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
}
}
rsVo.obj = list;
@@ -130,8 +139,12 @@
List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
- vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
- vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ if(vo.getClType() != null){
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
}
}
rsVo.obj = list;
--
Gitblit v1.8.0