From bd83b3c730b07e4120f9ccacccc6b7fd1ba616bc Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 9 Jan 2025 15:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RecordInspectionController.java  |  7 +++----
 .../manage/domain/RecordInspectionTask.java     |  1 +
 .../manage/mapper/RecordInspectionMapper.java   |  2 ++
 .../service/IRecordInspectionService.java       |  1 +
 .../impl/RecordInspectionServiceImpl.java       |  5 +++++
 .../mapper/manage/RecordInspectionMapper.xml    | 17 ++++++++++++++++-
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java
index e54d28c..33c9457 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java
@@ -57,11 +57,10 @@ public class RecordInspectionController extends BaseController {
     @GetMapping("/print")
     public String print(String ids) {
         System.out.println(ids);
+        List<RecordInspection> list = recordInspectionService.selectListByids(ids);
+
+        List<RecordInspectionTask> infolist=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids);
 
-        List<RecordInspectionTask> list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids);
-        System.out.println("巡检记录"+list.toString());
-        // List<RecordInspectionImg> recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids);
-        // System.out.println("巡检图片"+recordInspectionImgs.size());
         return prefix +"";
     }
 
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java
index 9c52c28..9963eb8 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java
@@ -109,6 +109,7 @@ public class RecordInspectionTask extends BaseEntity
             .append("areaName", getAreaName())
             .append("planePosition", getPlanePosition())
             .append("taskState", getTaskState())
+            .append("imgPath", getImgPath())
             .toString();
     }
 }
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java
index e104b9c..4d1e68f 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java
@@ -61,4 +61,6 @@ public interface RecordInspectionMapper
     public int deleteRecordInspectionByInspectionIds(String[] inspectionIds);
 
     int countInsertRecordNumber();
+
+    List<RecordInspection> selectListByids(String[] strArray);
 }
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java
index 30dda54..1f24a60 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java
@@ -60,4 +60,5 @@ public interface IRecordInspectionService
     public int deleteRecordInspectionByInspectionId(Long inspectionId);
 
 
+    List<RecordInspection> selectListByids(String ids);
 }
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java
index 7567d85..bac344e 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java
@@ -93,5 +93,10 @@ public class RecordInspectionServiceImpl implements IRecordInspectionService {
         return recordInspectionMapper.deleteRecordInspectionByInspectionId(inspectionId);
     }
 
+    @Override
+    public List<RecordInspection> selectListByids(String ids) {
+
 
+        return recordInspectionMapper.selectListByids(Convert.toStrArray(ids));
+    }
 }
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml
index 0b50270..39a1a48 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml
@@ -82,5 +82,20 @@
     <select id="countInsertRecordNumber" resultType="integer">
         select count(inspection_id) from record_inspection where date(inspection_time)= date(now())
     </select>
-
+    <select id="selectListByids"  resultMap="RecordInspectionResult">
+        select ri.inspection_id,
+        inspection_time,
+        inspection_user,
+        count(rii.inspection_id) as total_number,
+        count(if(inspection_state = '正常', true, null)) as normal_number,
+        count(if(inspection_state = '异常', true, null)) as abnormal_number,
+        count(if(inspection_state = '跳过', true, null)) as skip_number
+        from record_inspection ri
+        left join record_inspection_info rii on ri.inspection_id = rii.inspection_id
+        where ri.inspection_id in
+        <foreach item="inspectionId" collection="array" open="(" separator="," close=")">
+            #{inspectionId}
+        </foreach>
+        group by ri.inspection_id
+    </select>
 </mapper>
\ No newline at end of file