add 企业端-查询当前人是否是分标委或理事会成员

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java

@@ -235,6 +235,6 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
     @ApiOperation(value = "校验是否为会员单位")
     @GetMapping(value = "/checkMember")
     public Result<Boolean> checkMember(String companyName) {
-        return Result.OK(payMeetingSituationService.checkMember(companyName));
+        return Result.OK(payMeetingSituationService.checkMemberCompany(companyName));
     }
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java

@@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.meeting.valid.group.SignIn;
 import com.jero.meeting.vo.*;
 import com.jero.meeting.vo.excel.*;
-import com.jero.project.common.PayProjectCommon;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.apache.commons.lang3.StringUtils;
@@ -64,36 +63,6 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     private IPayCompanyManagementService companyManagementService;
 
     private final Integer MEETING_TYPE = null;
-    /**
-     * 分页列表查询
-     */
-    //@CompanyNameTranslate
-    //@RequiresPermissions("meetingSituation:search")
-    //@ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
-    //@GetMapping(value = "/page")
-    //public Result<?> queryPageList(PayMeetingSituation payMeetingSituation,
-    //                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-    //                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-    //                               HttpServletRequest req) {
-    //    QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
-    //    String particularYear = req.getParameter("particularYear");
-    //    if (StringUtils.isNotBlank(particularYear)){
-    //        queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
-    //    }
-    //    Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
-    //    IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper,MEETING_TYPE);
-    //    List<PayMeetingSituation> situationList = pageList.getRecords();
-    //    for (PayMeetingSituation meetingSituation : situationList) {
-    //        Integer payMode = meetingSituation.getPayMode();
-    //        //汇款并且缴费凭证为空
-    //        if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){
-    //            meetingSituation.setIdentification(PayProjectCommon.YES);
-    //        }else {
-    //            meetingSituation.setIdentification(PayProjectCommon.NO);
-    //        }
-    //    }
-    //    return Result.OK(pageList);
-    //}
 
     /**
      * 合同查询未关联参会人列表
@@ -152,19 +121,6 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         return Result.OK("报名成功",payMeetingSituationService.signUp(payMeetingSituation));
     }
 
-
-    ///**
-    // * 编辑
-    // */
-    //@AutoLog(value = "参会人员信息-编辑")
-    //@RequiresPermissions("meetingSituation:edit")
-    //@ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑")
-    //@PostMapping(value = "/edit")
-    //public Result<?> edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
-    //    payMeetingSituationService.editById(payMeetingSituationVO, MEETING_TYPE);
-    //    return Result.OK("编辑成功!");
-    //}
-
     /**
      * 企业端上传缴费凭证 编辑
      */
@@ -381,4 +337,15 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         Integer integer = payMeetingSituationService.standardsCheckPhone(meetingId, phone);
         return Result.OK(integer);
     }
+
+    /**
+     * 查询当前人是否是成员
+     */
+    @ApiOperation(value = "企业端-查询当前人是否是分标委或理事会成员")
+    @GetMapping(value = "/checkMember")
+    public Result<?> checkMember(@RequestParam(name = "meetingId") String meetingId,
+                                 @RequestParam(name = "meetingType") Integer meetingType) {
+        Boolean aBoolean = payMeetingSituationService.checkMember(meetingId, meetingType);
+        return Result.OK(aBoolean);
+    }
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java

@@ -30,7 +30,7 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 	 */
     void editById(PayMeetingSituationVO payMeetingSituationVO, Integer meetingType);
 
-    Boolean checkMember(String companyName);
+    Boolean checkMemberCompany(String companyName);
 
     /**
 	 * 通过id删除
@@ -86,4 +86,6 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 	Class<?> getaClass(Integer meetingType);
 
     Integer standardsCheckPhone(String meetingId, String phone);
+
+	Boolean checkMember(String meetingId, Integer meetingType);
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -1093,7 +1093,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             boolean checkMember = false;
             boolean isZero;
             if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                checkMember = checkMember(payMeetingSituation1.getCompanyName());
+                checkMember = checkMemberCompany(payMeetingSituation1.getCompanyName());
             }
             if (checkMember){
                 BigDecimal meetingCostsVip = payMeeting.getMeetingCostsVip();
@@ -1256,7 +1256,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
      * @return boolean
      */
     @Override
-    public Boolean checkMember(String companyName){
+    public Boolean checkMemberCompany(String companyName){
         return memberInfoService.check(companyName) > 0;
     }
 
@@ -1570,4 +1570,30 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         Integer integer = baseMapper.standardsCheckPhone(meetingId, PasswordUtil.encrypt(phone));
         return integer;
     }
+
+    @Override
+    public Boolean checkMember(String meetingId, Integer meetingType) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = sysUser.getId();
+        PayMeeting payMeeting = meetingService.getById(meetingId);
+        if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) {
+            LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());
+            wrapper.eq(PayCaseCommitteeSubitem::getContactsId, userId);
+
+            int count = payCaseCommitteeSubitemService.count(wrapper);
+            if (count > 0) {
+                return true;
+            }
+        } else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)) {
+            LambdaQueryWrapper<PayCaseCouncilSubitem> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayCaseCouncilSubitem::getCouncilId, payMeeting.getCouncilId());
+            wrapper.eq(PayCaseCouncilSubitem::getContactsId, userId);
+            int count = payCaseCouncilSubitemService.count(wrapper);
+            if (count > 0) {
+                return true;
+            }
+        }
+        return null;
+    }
 }