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() { return R.ok(service.lambdaQuery().orderByAsc(InspectPoint::getOrderIndex).list()); } + @Operation(summary = "列表(带巡检项)") + @GetMapping("/listWithItem") + public R> 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 { @Select(""" """) List 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 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 listWithItem() { + List list = this.lambdaQuery().orderByAsc(InspectPoint::getOrderIndex).list(); + for(InspectPoint point : list){ + point.setChildren(inspectItemMapper.selectList(new QueryWrapper().eq("point_id",point.getId()).orderByAsc("order_index"))); + } + return list; + } }