修改起草组会议审核

2024-01-10 14:00:44 +08:00
parent d573a64102
commit aea0d61ecd
9 changed files with 131 additions and 29 deletions
@@ -20,6 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -60,6 +61,7 @@ public class PayDraftingGroupResearchProjectController extends JeroController<Pa
    @AutoLog(value = "起草组-在研项目-分页列表查询")
    @ApiOperation(value="起草组-在研项目-分页列表查询", notes="起草组-在研项目-分页列表查询")
    @GetMapping(value = "/list")
+    @RequiresPermissions("draftingGroup:underStudy:search")
    public Result<?> queryPageList(PayDraftingGroupResearchProject payResearchProject,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
@@ -88,6 +90,7 @@ public class PayDraftingGroupResearchProjectController extends JeroController<Pa
    @AutoLog(value = "起草组-在研项目-新增")
    @ApiOperation(value="起草组-在研项目-新增", notes="起草组-在研项目-新增")
    @PostMapping(value = "/add")
+    @RequiresPermissions("draftingGroup:underStudy:add")
    public Result<?> add(@RequestBody PayDraftingGroupResearchProject payResearchProject) {
        StringBuilder msg = ValidUtil.validateAll(payResearchProject);
        if (!StringUtils.isBlank(msg)) {
@@ -125,6 +128,7 @@ public class PayDraftingGroupResearchProjectController extends JeroController<Pa
    @AutoLog(value = "起草组-在研项目-通过id删除")
    @ApiOperation(value="起草组-在研项目-通过id删除", notes="起草组-在研项目-通过id删除")
    @GetMapping(value = "/delete")
+    @RequiresPermissions("draftingGroup:underStudy:delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        if (StringUtils.isBlank(id)) {
            return Result.error("id不能为空");
@@ -153,6 +157,7 @@ public class PayDraftingGroupResearchProjectController extends JeroController<Pa
    @AutoLog(value = "起草组-在研项目-批量删除")
    @ApiOperation(value="起草组-在研项目-批量删除", notes="起草组-在研项目-批量删除")
    @GetMapping(value = "/deleteBatch")
+    @RequiresPermissions("draftingGroup:underStudy:batchDel")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        if (StringUtils.isBlank(ids)) {
            return Result.error("id不能为空");
@@ -174,6 +179,7 @@ public class PayDraftingGroupResearchProjectController extends JeroController<Pa
    @AutoLog(value = "起草组-在研项目-编辑")
    @ApiOperation(value="起草组-在研项目-编辑", notes="起草组-在研项目-编辑")
    @PostMapping(value = "/edit")
+    @RequiresPermissions("draftingGroup:underStudy:edit")
    public Result<?> edit(@RequestBody PayDraftingGroupResearchProject payResearchProject) {
        StringBuilder msg = ValidUtil.validateAll(payResearchProject);
        if (!StringUtils.isBlank(msg)) {
@@ -18,7 +18,9 @@ import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
 import com.jero.drafting.service.IPayDraftingGroupService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemService;
+import com.jero.drafting.vo.CheckVo;
 import com.jero.drafting.vo.PayDraftingGroupSubItemExcel;
+import com.jero.meeting.vo.CheckVO;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import io.swagger.annotations.Api;
@@ -185,22 +187,6 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
        return Result.OK("编辑成功!");
    }

-//    /**
-//     * 通过id查询
-//     *
-//     * @param id 起草组成员
-//     * @return
-//     */
-//    @ApiOperation(value = "起草组成员-通过id查询", notes = "起草组成员-通过id查询")
-//    @GetMapping(value = "/queryById")
-//    public Result<?> queryById(@RequestParam(name = "id") String id) {
-//        PayDraftingGroupSubItem payDraftingGroupSubitem = payDraftingGroupSubItemService.getById(id);
-//        if (payDraftingGroupSubitem == null) {
-//            return Result.error("未找到对应数据");
-//        }
-//        ProjectDetailVO projectDetailVO = projectDetailService.getProjectDetail(payDraftingGroupSubitem.getId());
-//        return Result.OK(projectDetailVO);
-//    }

    /**
     * 模板下载
@@ -378,4 +364,16 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
        }
        return super.exportListXls(excelList, PayDraftingGroupSubItemExcel.class, "起草组成员");
    }
+
+    /**
+     * 审核起草组报名信息
+     */
+    @AutoLog(value = "审核起草组报名信息")
+//    @RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
+    @ApiOperation(value = "审核起草组报名信息")
+    @PostMapping(value = "/checkRegister")
+    public Result<?> checkRegister(@RequestBody CheckVo checkVO) {
+        payDraftingGroupSubItemService.checkRegister(checkVO);
+        return Result.OK("审核成功!");
+    }
 }
@@ -421,4 +421,8 @@ public class PayDraftingGroupSubItem implements Serializable {
    /**审核状态 1:待审核 2:已通过 3:已驳回**/
    @ApiModelProperty(value = "审核状态")
    private Integer checkResult;
+
+    /**审核说明**/
+    @ApiModelProperty(value = "审核说明")
+    private Integer checkRemark;
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.drafting.entity.PayDraftingGroupSubItem;
+import com.jero.drafting.vo.CheckVo;
 import com.jero.project.entity.PayWorkingGroupSubItem;

 import javax.servlet.http.HttpServletRequest;
@@ -64,4 +65,10 @@ public interface IPayDraftingGroupSubItemService extends IService<PayDraftingGro
     * @return
     */
    IPage<PayDraftingGroupSubItem> publishReminderList(Page<PayDraftingGroupSubItem> page, PayDraftingGroupSubItem payDraftingGroupSubItem);
+
+    /**
+     * 审核报名信息
+     * @param checkVO
+     */
+    void checkRegister(CheckVo checkVO);
 }
@@ -23,6 +23,11 @@ import com.jero.drafting.mapper.PayDraftingGroupSubItemMapper;
 import com.jero.drafting.service.IPayDraftingGroupService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemService;
+import com.jero.drafting.vo.CheckVo;
+import com.jero.meeting.common.MeetingCommon;
+import com.jero.meeting.entity.PayMeeting;
+import com.jero.meeting.entity.PayMeetingContacts;
+import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingRemindRecordService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
@@ -654,4 +659,41 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
    public IPage<PayDraftingGroupSubItem> publishReminderList(Page<PayDraftingGroupSubItem> page, PayDraftingGroupSubItem payDraftingGroupSubItem) {
        return payDraftingGroupSubItemMapper.publishReminderList(page,payDraftingGroupSubItem);
    }
+
+    /**
+     * 审核报名信息
+     *
+     * @param checkVO
+     */
+    @Override
+    public void checkRegister(CheckVo checkVO) {
+        String payDraftingGroupSubItemId = checkVO.getId();
+        String checkRemark = checkVO.getCheckRemark();
+        Integer checkResult = checkVO.getCheckResult();
+        PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(payDraftingGroupSubItemId);
+        //判断是否有权限审核
+        verificationGuests(payDraftingGroupSubItem);
+        LambdaUpdateWrapper<PayDraftingGroupSubItem> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(PayDraftingGroupSubItem::getId,payDraftingGroupSubItemId);
+        updateWrapper.set(StringUtils.isNotBlank(checkRemark),PayDraftingGroupSubItem::getCheckRemark,checkRemark);
+        updateWrapper.set(!Objects.isNull(checkResult),PayDraftingGroupSubItem::getCheckResult,checkResult);
+        payDraftingGroupSubItemService.update(updateWrapper);
+    }
+
+    /**
+     * 判断是否有权限审核
+     *
+     * @author lijiarao
+     * @date 2021/9/28
+     */
+    private void verificationGuests(PayDraftingGroupSubItem payDraftingGroupSubItem) {
+        //判断是否有权限审核
+        String draftingGroupId = payDraftingGroupSubItem.getDraftingGroupId();
+        PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupId);
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String sysUserId = sysUser.getId();
+//        if (!rolePermissionService.getRolePermission("draftingGroupMember:check") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUserId)) {
+//           throw new JeroBootException("没有审核的权限");
+//        }
+    }
 }
@@ -0,0 +1,19 @@
+package com.jero.drafting.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CheckVo {
+
+    @ApiModelProperty("审核结果 1:待审核 2:已通过 3:拒绝")
+    private Integer checkResult;
+
+    @ApiModelProperty("审核说明")
+    private String checkRemark;
+
+    @ApiModelProperty("起草组id")
+    private String id;
+}
+
@@ -51,7 +51,7 @@ public class DraftGroupMeetingController {
    /**
     * 分页列表查询
     */
-//    @RequiresPermissions("draftGroupMeetingSituation:search")
+    @RequiresPermissions("draftGroupMeeting:search")
    @ApiOperation(value = "会议管理-分页列表查询", notes = "会议管理-分页列表查询")
    @GetMapping(value = "/page")
    public Result<?> queryPageList(PayMeeting payMeeting,
@@ -66,7 +66,7 @@ public class DraftGroupMeetingController {
    /**
     * 添加
     */
-//    @RequiresPermissions("draftGroupMeetingSituation:add")
+    @RequiresPermissions("draftGroupMeeting:add")
    @AutoLog(value = "会议管理-添加")
    @ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
    @PostMapping(value = "/add")
@@ -83,7 +83,7 @@ public class DraftGroupMeetingController {
    /**
     * 编辑
     */
-//    @RequiresPermissions("draftGroupMeetingSituation:edit")
+//    @RequiresPermissions("draftGroupMeeting:edit")
    @AutoLog(value = "会议管理-编辑")
    @ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
    @PostMapping(value = "/edit")
@@ -116,7 +116,7 @@ public class DraftGroupMeetingController {
    /**
     * 通过id删除
     */
-//    @RequiresPermissions("draftGroupMeetingSituation:delete")
+    @RequiresPermissions("draftGroupMeeting:delete")
    @AutoLog(value = "会议管理-通过id删除")
    @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
    @GetMapping(value = "/delete")
@@ -129,7 +129,7 @@ public class DraftGroupMeetingController {
    /**
     * 批量删除
     */
-//    @RequiresPermissions("draftGroupMeetingSituation:batchDel")
+    @RequiresPermissions("draftGroupMeeting:batchDel")
    @AutoLog(value = "会议管理-批量删除")
    @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
    @GetMapping(value = "/deleteBatch")
@@ -145,7 +145,7 @@ public class DraftGroupMeetingController {
    /**
     * 通过id查询
     */
-//    @ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询")
+    @ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id") String id) {
        PayMeeting meeting = payMeetingService.queryById(id);
@@ -177,7 +177,7 @@ public class DraftGroupMeetingController {
     * 上传文件
     */
    @AutoLog(value = "上传文件")
-//    @RequiresPermissions("draftGroupMeeting:upload")
+    @RequiresPermissions("draftGroupMeeting:upload")
    @ApiOperation(value = "上传资料", notes = "上传文件")
    @PostMapping(value = "/uploadFile")
    public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
@@ -189,7 +189,7 @@ public class DraftGroupMeetingController {
     * 上传会议纪要
     */
    @AutoLog(value = "上传会议纪要")
-//    @RequiresPermissions("draftGroupMeeting:uploadCouncil")
+    @RequiresPermissions("draftGroupMeeting:uploadCouncil")
    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
    @PostMapping(value = "/uploadCouncilFile")
    public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
@@ -201,7 +201,7 @@ public class DraftGroupMeetingController {
     * 发布提醒
     */
    @AutoLog("发布提醒")
-//    @RequiresPermissions("draftGroupMeeting:publish")
+    @RequiresPermissions("draftGroupMeeting:publish")
    @ApiOperation(value = "发布提醒", notes = "发布提醒")
    @PostMapping(value = "/publishReminder")
    public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
@@ -186,7 +186,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
     * 审核报名信息
     */
    @AutoLog(value = "审核报名信息")
-    @RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
+//    @RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
    @ApiOperation(value = "审核报名信息")
    @PostMapping(value = "/checkRegister")
    public Result<?> checkRegister(@RequestBody CheckVO checkVO) {
@@ -194,6 +194,18 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
        return Result.OK("审核成功!");
    }

+    /**
+     * 审核缴费凭证
+     */
+//    @RequiresPermissions("workGroupMeetingSituation:auditCredentials")
+    @AutoLog(value = "审核缴费凭证")
+    @ApiOperation(value = "审核缴费凭证")
+    @PostMapping(value = "/check")
+    public Result<?> check(@RequestBody CheckVO checkVO) {
+        payMeetingSituationService.check(checkVO);
+        return Result.OK("审核成功!");
+    }
+
    /**
     * 设置嘉宾上传文件
     */
@@ -46,6 +46,8 @@ import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.jero.data.service.IPayCaseCommitteeSubitemService;
 import com.jero.data.service.IPayCaseCouncilService;
 import com.jero.data.service.IPayCaseCouncilSubitemService;
+import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
+import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.service.IPayMailBillService;
 import com.jero.meeting.common.MeetingCommon;
@@ -161,6 +163,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
    private PayMeetingGuestsFileMapper meetingGuestsFileMapper;
    @Resource
    private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private IPayDraftingGroupSubItemContactsService draftingGroupSubItemContactsService;


    private static final String[] CAN_MODIFY_LIST =
@@ -586,7 +590,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
            payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG1,"record");
            //非成员单位审核通过且上传的缴费凭证审核通过也发送。（即需要审核的都审核通过才发送）
            sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG6, "C_OPEN_TYPE6");
-
        }
    }

@@ -1343,6 +1346,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
            if (count <= 0) {
                payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
            }
+        }  else if (meetingType.equals(MeetingCommon.DRAFTING_GROUP_MEETING_INT)) {
+            LambdaQueryWrapper<PayDraftingGroupSubItemContacts> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId, payMeeting.getDraftingGroupId());
+            wrapper.eq(PayDraftingGroupSubItemContacts::getContactsId, payMeetingSituation1.getCompanyContactId());
+
+            int count = draftingGroupSubItemContactsService.count(wrapper);
+            if (count <= 0) {
+                payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+            }
        } else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) {
            LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());
@@ -1828,9 +1840,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        String meetingId = setGuestsUploadFileVO.getMeetingId();
        PayMeeting payMeeting = meetingService.getById(meetingId);
        String meetingType = payMeeting.getMeetingType().toString();
+        Integer meetingType2 = MeetingCommon.DRAFTING_GROUP_MEETING_INT;

-
-        if (meetingType1 != null && !Objects.equals(payMeeting.getMeetingType(),meetingType1)) {
+        if (meetingType == null ||
+                (!Objects.equals(payMeeting.getMeetingType(), meetingType1) &&
+                        !Objects.equals(payMeeting.getMeetingType(), meetingType2))) {
            throw new JeroBootException("数据权限不足");
        }