From 78a553c1bd850ec811a5345220f6f3fbc7afee4b Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jul 2024 13:43:14 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=B7=A5=E4=BD=9C=E7=BB=84,=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AE=A1=E6=A0=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DraftGroupMeetingSituationController.java | 23 +++++++++++++++++++ .../WorkGroupMeetingSituationController.java | 23 +++++++++++++++++++ .../java/com/jero/meeting/vo/CheckVO.java | 1 + .../AnnualMemberProjectController.java | 4 ++-- .../service/IAnnualMemberProjectService.java | 8 +++---- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java index 030ebc28..324f52b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java @@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 起草组会议 参会人信息 @@ -194,6 +195,28 @@ public class DraftGroupMeetingSituationController extends JeroController checkRegisterBatch(@RequestBody CheckVO checkVO) { + List ids = Arrays.asList(checkVO.getIds().split(",")); + List checkVOS = ids.stream() + .map(id -> { + CheckVO checkVO1 = new CheckVO(); + checkVO1.setCheckResult(checkVO.getCheckResult()); + checkVO1.setCheckRemark(checkVO.getCheckRemark()); + checkVO1.setId(id); + return checkVO1; + }) + .collect(Collectors.toList()); + checkVOS.forEach(payMeetingSituationService::checkRegister); + return Result.OK("审核成功!"); + } + // /** // * 审核缴费凭证 // */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index f359b550..3894adf6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** @@ -203,6 +204,28 @@ public class WorkGroupMeetingSituationController extends JeroController checkRegisterBatch(@RequestBody CheckVO checkVO) { + List ids = Arrays.asList(checkVO.getIds().split(",")); + List checkVOS = ids.stream() + .map(id -> { + CheckVO checkVO1 = new CheckVO(); + checkVO1.setCheckResult(checkVO.getCheckResult()); + checkVO1.setCheckRemark(checkVO.getCheckRemark()); + checkVO1.setId(id); + return checkVO1; + }) + .collect(Collectors.toList()); + checkVOS.forEach(payMeetingSituationService::checkRegister); + return Result.OK("审核成功!"); + } + /** * 合并开票 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java index a2631235..03001253 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java @@ -13,4 +13,5 @@ public class CheckVO { private Integer checkResult; private String checkRemark; private String id; + private String ids; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java index fa6b7014..59e23b89 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java @@ -39,7 +39,7 @@ public class AnnualMemberProjectController extends JeroController> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem, @@ -55,7 +55,7 @@ public class AnnualMemberProjectController extends JeroController pageList = annualMemberProjectService.pageList(req, tbMemberProjectSubitem); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java index 19ac4c45..22ebb539 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java @@ -56,10 +56,10 @@ public class IAnnualMemberProjectService { queryWrapper.eq("year(effective_date)",effectiveDate.year()); queryWrapper.eq("month(effective_date)",effectiveDate.month()+1); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { - queryWrapper.eq("tmp.director_id",sysUser.getId()); - } +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { +// queryWrapper.eq("tmp.director_id",sysUser.getId()); +// } return queryWrapper; }