yzx 1 месяц назад
Родитель
Сommit
07da55d0f3

+ 3 - 3
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/SpecimenInfoController.java

@@ -111,11 +111,11 @@ public class SpecimenInfoController {
     @PreAuthorize("@ss.hasPermission('museums:specimen-info:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportSpecimenInfoSelectExcel(@Valid SpecimenInfoExportReqVO pageReqVO,
-                                        @RequestParam List<Long> ids,  // 接收前端传递的 ID 数组
                                         HttpServletResponse response) throws IOException {
+        List <Long> ids = new ArrayList<>();
         // 如果有 ID 数组,设置查询条件,过滤查询
-        if (!ids.isEmpty()) {
-            pageReqVO.setIds(ids);  // 设置过滤条件
+        if (pageReqVO.getIds() != null && !pageReqVO.getIds().isEmpty()) {
+            ids = pageReqVO.getIds();  // 设置过滤条件
         }
 
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);  // 设置不分页

+ 3 - 0
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/SpecimenOutboundController.java

@@ -137,6 +137,9 @@ public class SpecimenOutboundController {
         result.getList().forEach(item -> {
             item.setIsFirstOut(Objects.equals(item.getOperator(), getLoginUserId()));
         });
+        result.getList().forEach(item -> {
+            item.setIsFirstRet(Objects.equals(item.getReturnConfirm(), Objects.requireNonNull(getLoginUserId()).toString()));
+        });
         return success(result);
     }
 

+ 2 - 0
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundRespVO.java

@@ -135,4 +135,6 @@ public class SpecimenOutboundRespVO {
     private String twoApproveUsers;
 
     private Boolean isFirstOut;
+
+    private Boolean isFirstRet;
 }