add:工作组,起草组会议新增批量审核接口

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<PayMeet
         return Result.OK("审核成功!");
     }
 
+    /**
+     * 批量审核报名信息
+     */
+    @AutoLog(value = "批量审核报名信息")
+    @RequiresPermissions("draftGroupMeetingSituation:batchAuditSignUp")
+    @ApiOperation(value = "批量审核报名信息")
+    @PostMapping(value = "/checkRegisterBatch")
+    public Result<?> checkRegisterBatch(@RequestBody CheckVO checkVO) {
+        List<String> ids = Arrays.asList(checkVO.getIds().split(","));
+        List<CheckVO> 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("审核成功!");
+    }
+
 //    /**
 //     * 审核缴费凭证
 //     */

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<PayMeeti
         return Result.OK("审核成功!");
     }
 
+    /**
+     * 批量审核报名信息
+     */
+    @AutoLog(value = "批量审核报名信息")
+    @RequiresPermissions("workGroupMeetingSituation:batchAuditSignUp")
+    @ApiOperation(value = "批量审核报名信息")
+    @PostMapping(value = "/checkRegisterBatch")
+    public Result<?> checkRegisterBatch(@RequestBody CheckVO checkVO) {
+        List<String> ids = Arrays.asList(checkVO.getIds().split(","));
+        List<CheckVO> 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("审核成功!");
+    }
+
     /**
      * 合并开票
      */

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;
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java

@@ -39,7 +39,7 @@ public class AnnualMemberProjectController extends JeroController<TbMemberProjec
     /**
      * 分页列表查询
      */
-    @RequiresPermissions("safeguardStardsMember:search")
+//    @RequiresPermissions("safeguardStardsMember:search")
     @ApiOperation(value="年度会员维护-分页列表查询", notes="年度会员维护-分页列表查询")
     @GetMapping(value = "/page")
     public Result<IPage<TbMemberProjectSubitem>> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem,
@@ -55,7 +55,7 @@ public class AnnualMemberProjectController extends JeroController<TbMemberProjec
      * 导出excel
      */
     @ApiOperation(value = "导出")
-    @RequiresPermissions("safeguardStardsMember:export")
+//    @RequiresPermissions("safeguardStardsMember:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest req, TbMemberProjectSubitem tbMemberProjectSubitem) {
         List<TbMemberProjectSubitem> pageList = annualMemberProjectService.pageList(req, tbMemberProjectSubitem);

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;
     }