From 091d30b4e497398a571d525f794d6b52ecd2efcc Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Wed, 21 Oct 2026 15:28:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E9=80=89=E6=8B=A9=E9=80=9A=E6=8A=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=95=B0=E6=85=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervise/SuperviseReportController.java  | 16 ++++++----
 .../pojo/vo/SuperviseReportOptionVo.java      | 13 ++++++++
 .../service/SuperviseReportService.java       | 30 +++++++++++++++++++
 3 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/SuperviseReportOptionVo.java

diff --git a/src/main/java/com/biutag/supervision/controller/supervise/SuperviseReportController.java b/src/main/java/com/biutag/supervision/controller/supervise/SuperviseReportController.java
index a3d5ca3..a59712d 100644
--- a/src/main/java/com/biutag/supervision/controller/supervise/SuperviseReportController.java
+++ b/src/main/java/com/biutag/supervision/controller/supervise/SuperviseReportController.java
@@ -1,24 +1,19 @@
 package com.biutag.supervision.controller.supervise;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.entity.SuperviseReport;
 import com.biutag.supervision.pojo.entity.SuperviseReportFile;
-import com.biutag.supervision.pojo.param.SupRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.param.SuperviseReportQueryParam;
-import com.biutag.supervision.pojo.vo.SupRiskPersonalVo;
+import com.biutag.supervision.pojo.vo.SuperviseReportOptionVo;
 import com.biutag.supervision.pojo.vo.SuperviseReportVo;
-import com.biutag.supervision.service.SuperviseReportFileService;
 import com.biutag.supervision.service.SuperviseReportService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -27,6 +22,15 @@ import java.util.List;
 public class SuperviseReportController {
 
     private final SuperviseReportService service;
+
+    /**
+     * 通报期数下拉选项。
+     */
+    @GetMapping("/options")
+    Result<List<SuperviseReportOptionVo>> options(@RequestParam(value = "reportName", required = false) String reportName) {
+        return Result.success(service.options(reportName));
+    }
+
     /**
      * 分页
      * */
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SuperviseReportOptionVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SuperviseReportOptionVo.java
new file mode 100644
index 0000000..aa20c22
--- /dev/null
+++ b/src/main/java/com/biutag/supervision/pojo/vo/SuperviseReportOptionVo.java
@@ -0,0 +1,13 @@
+package com.biutag.supervision.pojo.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SuperviseReportOptionVo {
+
+    private String id;
+
+    private String reportName;
+}
diff --git a/src/main/java/com/biutag/supervision/service/SuperviseReportService.java b/src/main/java/com/biutag/supervision/service/SuperviseReportService.java
index cebf20a..96a424b 100644
--- a/src/main/java/com/biutag/supervision/service/SuperviseReportService.java
+++ b/src/main/java/com/biutag/supervision/service/SuperviseReportService.java
@@ -16,6 +16,7 @@ import com.biutag.supervision.mapper.SuperviseReportMapper;
 import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.SuperviseReportQueryParam;
+import com.biutag.supervision.pojo.vo.SuperviseReportOptionVo;
 import com.biutag.supervision.pojo.vo.SuperviseReportVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,35 @@ public class SuperviseReportService extends ServiceImpl<SuperviseReportMapper, S
     private final NegativeService negativeService;
 
     private final SuperviseReportDepartService superviseReportDepartService;
+
+    /**
+     * 通报期数选项，仅查询最新的100条报告ID和名称。
+     */
+    public List<SuperviseReportOptionVo> options(String reportName) {
+        LambdaQueryWrapper<SuperviseReport> queryWrapper = new LambdaQueryWrapper<>();
+        UserAuth user = UserContextHolder.getCurrentUser();
+        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
+            if (user.getAuthDepartIds().isEmpty() || user.getRoleCodes().isEmpty()) {
+                return new ArrayList<>();
+            }
+            List<String> orgIds = departService.getAllNodeIds(user.getAuthDepartIds());
+            if (CollectionUtil.isEmpty(orgIds)) {
+                return new ArrayList<>();
+            }
+            queryWrapper.in(SuperviseReport::getCrtDepartId, orgIds);
+        }
+        queryWrapper.select(SuperviseReport::getId, SuperviseReport::getReportName)
+                .like(StrUtil.isNotEmpty(reportName), SuperviseReport::getReportName, reportName)
+                .orderByDesc(SuperviseReport::getCrtTime)
+                .last("limit 100");
+        return list(queryWrapper).stream().map(report -> {
+            SuperviseReportOptionVo option = new SuperviseReportOptionVo();
+            option.setId(report.getId());
+            option.setReportName(report.getReportName());
+            return option;
+        }).collect(Collectors.toList());
+    }
+
     /**
      * 分页查询
      * */