From 8367a132dee4602083be2b2d865565c97579c557 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 22 十一月 2024 17:23:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 7 ++++++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java | 5 +++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml | 3 ++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
index 4e5ff81..7b1620e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
@@ -4,6 +4,7 @@
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import java.util.Date;
import java.util.List;
@@ -35,12 +36,12 @@
* 寮�濮嬪贰妫�鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Data startTime;
+ private Date startTime;
/**
* 缁撴潫宸℃鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Data stopTime;
+ private Date stopTime;
/**
* 鍚勪釜宸℃鐐�
*/
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml
index 52d3403..6231a5d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml
@@ -109,7 +109,8 @@
</foreach>
</insert>
<!--鏍规嵁宸℃id鏌ヨ杞ㄨ抗-->
- <select id="selectByInspectId" resultMap="BaseResultMap">
+<!-- <select id="selectByInspectId" resultMap="BaseResultMap">-->
+ <select id="selectByInspectId" resultType="com.dy.pipIrrGlobal.pojoOp.OpeTrack">
SELECT
id,
inspect_id AS inspectId,
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..00a4d0d 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
@@ -34,6 +34,7 @@
/**
* 娣诲姞宸℃璁板綍
+ *
* @param po
* @return
*/
@@ -44,6 +45,7 @@
/**
* 淇敼宸℃璁板綍
+ *
* @param po
* @return
*/
@@ -53,6 +55,7 @@
/**
* 鎵归噺娣诲姞宸℃杞ㄨ抗
+ *
* @param list
* @return
*/
@@ -62,6 +65,7 @@
/**
* 宸℃鏌ヨ
+ *
* @param queryVo
* @return
*/
@@ -90,7 +94,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