From 0f36c6976a6ca3dd6c07a27a2dd012837aa0c40e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 14 一月 2025 14:01:25 +0800
Subject: [PATCH] 删除查询电池电压参数固定值配置与设置
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
index 7434053..c857afe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -7,7 +7,6 @@
import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.dy.pipIrrGlobal.voOp.VoInspect;
-import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +33,7 @@
/**
* 娣诲姞宸℃璁板綍
+ *
* @param po
* @return
*/
@@ -44,6 +44,7 @@
/**
* 淇敼宸℃璁板綍
+ *
* @param po
* @return
*/
@@ -53,6 +54,7 @@
/**
* 鎵归噺娣诲姞宸℃杞ㄨ抗
+ *
* @param list
* @return
*/
@@ -62,6 +64,7 @@
/**
* 宸℃鏌ヨ
+ *
* @param queryVo
* @return
*/
@@ -69,11 +72,11 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String timeStart = queryVo.getTimeStart();
String timeStop = queryVo.getTimeStop();
- if (timeStart != null) {
+ if (timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
queryVo.setTimeStart(timeStart);
}
- if (timeStop != null) {
+ if (timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
queryVo.setTimeStop(timeStop);
}
@@ -90,7 +93,8 @@
List<VoInspect> inspects = opeInspectMapper.getInspects(params);
for (int i = 0; i < inspects.size(); i++) {
- inspects.get(i).setTracks(opeTrackMapper.selectByInspectId(inspects.get(i).getInspectId()));
+ List<OpeTrack> tracks = opeTrackMapper.selectByInspectId(inspects.get(i).getInspectId());
+ inspects.get(i).setTracks(tracks);
}
rsVo.obj = inspects;
return rsVo;
--
Gitblit v1.8.0