From 49879a00c067b800e8d632cc649507823a78b997 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 29 Aug 2024 16:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E5=B8=A6=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E9=A1=B9=E4=B8=8B=E6=8B=89=EF=BC=9B=E7=99=BD=E8=9A=81?=
 =?UTF-8?q?=E9=98=B2=E6=B2=BB=E5=AE=A3=E4=BC=A0=E8=BF=94=E5=9B=9E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/InspectPointController.java   | 7 ++++++-
 .../gunshi/project/xyt/mapper/TermiteSurveyMapper.java   | 2 +-
 .../java/com/gunshi/project/xyt/model/InspectPoint.java  | 5 +++++
 .../gunshi/project/xyt/service/InspectPointService.java  | 9 +++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/InspectPointController.java b/src/main/java/com/gunshi/project/xyt/controller/InspectPointController.java
index e14c4c6..51a31cc 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/InspectPointController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/InspectPointController.java
@@ -47,10 +47,15 @@ public class InspectPointController {
     }
 
     @Operation(summary = "列表")
-    @PostMapping("/list")
+    @GetMapping("/list")
     public R<List<InspectPoint>> list() {
         return R.ok(service.lambdaQuery().orderByAsc(InspectPoint::getOrderIndex).list());
     }
 
+    @Operation(summary = "列表（带巡检项）")
+    @GetMapping("/listWithItem")
+    public R<List<InspectPoint>> listWithItem() {
+        return R.ok(service.listWithItem());
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java
index 8a93d6a..a31666b 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java
@@ -43,7 +43,7 @@ public interface TermiteSurveyMapper extends BaseMapper<TermiteSurvey> {
 
     @Select("""
             <script>
-                    select * from public.file_descriptor where group_id = #{groupId}
+                    select *,file_size as fileLength from public.file_descriptor where group_id = #{groupId}
             </script>
              """)
     List<FileDescriptor> queryFileList(@Param("groupId") String groupId);
diff --git a/src/main/java/com/gunshi/project/xyt/model/InspectPoint.java b/src/main/java/com/gunshi/project/xyt/model/InspectPoint.java
index d3222c0..d1dc027 100644
--- a/src/main/java/com/gunshi/project/xyt/model/InspectPoint.java
+++ b/src/main/java/com/gunshi/project/xyt/model/InspectPoint.java
@@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
 * 描述: 巡检点
@@ -54,4 +55,8 @@ public class InspectPoint implements Serializable {
         @Schema(description="排序")
         private Integer orderIndex;
 
+        @TableField(exist = false)
+        @Schema(description = "巡检项")
+        private List<InspectItem> children;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/InspectPointService.java b/src/main/java/com/gunshi/project/xyt/service/InspectPointService.java
index fb77c08..5286989 100644
--- a/src/main/java/com/gunshi/project/xyt/service/InspectPointService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/InspectPointService.java
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -66,6 +67,14 @@ public class InspectPointService extends ServiceImpl<InspectPointMapper, Inspect
         }
         return this.removeById(id);
     }
+
+    public List<InspectPoint> listWithItem() {
+        List<InspectPoint> list = this.lambdaQuery().orderByAsc(InspectPoint::getOrderIndex).list();
+        for(InspectPoint point : list){
+            point.setChildren(inspectItemMapper.selectList(new QueryWrapper<InspectItem>().eq("point_id",point.getId()).orderByAsc("order_index")));
+        }
+        return list;
+    }
 }