From 0dc94cea5ab2be178a6e5615515282171b43bdb3 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 6 May 2026 16:45:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FishDraftDataController.java | 22 ++++++++++++++----- .../data/domain/BatchApproveRequest.java | 3 +++ .../data/mapper/SysUserDataScopeMapper.java | 2 +- .../impl/FishDraftDataServiceImpl.java | 10 ++++----- .../mapper/data/FishDraftDataMapper.xml | 4 ++-- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java index da95234..78a9ea1 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java +++ b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java @@ -202,7 +202,7 @@ public class FishDraftDataController { } @PostMapping("/submitDraftsAll") - @Operation(summary = "批量提交草稿") + @Operation(summary = "批量提交当前用户全部草稿") public ResponseResult submitDraftsAll() { List draft = fishDraftDataService.list(new LambdaQueryWrapper().eq(FishDraftData::getCreatedBy, SecurityUtils.getUserId()).eq(FishDraftData::getStatus, "DRAFT").select(FishDraftData::getId)); List ids = draft.stream().map(FishDraftData::getId).toList(); @@ -217,10 +217,22 @@ public class FishDraftDataController { return result ? ResponseResult.success("审批通过") : ResponseResult.error("审批失败"); } - @PostMapping("/batchApproveAll") - @Operation(summary = "批量全部审批通过") - public ResponseResult batchApproveAll(@RequestBody BatchApproveRequest request) { - List draft = fishDraftDataService.list(new LambdaQueryWrapper().eq(FishDraftData::getCreatedBy, SecurityUtils.getUserId()).eq(FishDraftData::getStatus, "PENDING").select(FishDraftData::getId)); +// @PostMapping("/batchApproveAll") +// @Operation(summary = "批量全部审批通过") +// public ResponseResult batchApproveAll(@RequestBody BatchApproveRequest request) { +// List draft = fishDraftDataService.list(new LambdaQueryWrapper().eq(FishDraftData::getCreatedBy, SecurityUtils.getUserId()).eq(FishDraftData::getStatus, "PENDING").select(FishDraftData::getId)); +// List ids = draft.stream().map(FishDraftData::getId).toList(); +// boolean result = fishDraftDataService.batchApprove(ids, request.getApproveComment()); +// return result ? ResponseResult.success("审批通过") : ResponseResult.error("审批失败"); +// } + + @PostMapping("/batchApproveByApprovalId") + @Operation(summary = "根据审批批次全部审批通过") + public ResponseResult batchApproveByApprovalId(@RequestBody BatchApproveRequest request) { + if (request.getApprovalIds().isEmpty()) { + return ResponseResult.error("请选择审批批次"); + } + List draft = fishDraftDataService.list(new LambdaQueryWrapper().in(FishDraftData::getApprovalId, request.getApprovalIds()).eq(FishDraftData::getStatus, "PENDING").select(FishDraftData::getId)); List ids = draft.stream().map(FishDraftData::getId).toList(); boolean result = fishDraftDataService.batchApprove(ids, request.getApproveComment()); return result ? ResponseResult.success("审批通过") : ResponseResult.error("审批失败"); diff --git a/backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java b/backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java index 08c3ac3..66226b5 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java @@ -15,6 +15,9 @@ public class BatchApproveRequest { @Schema(description = "草稿数据ID列表") private List ids; + @Schema(description = "批次ID列表") + List approvalIds; + @Schema(description = "审批意见") private String approveComment; } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java b/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java index 525fba4..8a592c2 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java +++ b/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java @@ -42,5 +42,5 @@ public interface SysUserDataScopeMapper extends BaseMapper { /** * 查询有效权限（状态=1且在有效期内的） */ - List selectValidPermissions(@Param("userId") Long userId); + List selectValidPermissions(@Param("userId") String userId); } diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java index 356960c..e696a84 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java @@ -82,14 +82,14 @@ public class FishDraftDataServiceImpl extends ServiceImpl resultPage = fishDraftDataMapper.selectJoinPage(page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime,userId,hbrvcd,approvalId); fillUserNames(resultPage.getRecords()); @@ -306,7 +306,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl permissions = userDataScopeMapper.selectValidPermissions(Long.parseLong(userId)); + List permissions = userDataScopeMapper.selectValidPermissions(userId); if (permissions == null || permissions.isEmpty()) { return; } diff --git a/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml b/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml index 1800c0b..0f0e942 100644 --- a/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml +++ b/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml @@ -164,10 +164,10 @@ AND D.APPROVAL_ID = #{approvalId} - AND D.TM >= TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss') + AND D.STRDT >= TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss') - AND D.TM <= TO_DATE(#{endTime}, 'yyyy-mm-dd hh24:mi:ss') + AND D.STRDT <= TO_DATE(#{endTime}, 'yyyy-mm-dd hh24:mi:ss') ORDER BY D.CREATED_AT DESC