Merge remote-tracking branch 'origin/branch20211210' into branch20211210

db/12月8日需求变更新增.sql

@@ -9,3 +9,8 @@ INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort
 VALUES ('1470221428149047297', '1432280766382727169', '理事会会议', '6', '', 6, 1, 'LKGLZ', '2021-12-13 10:37:58');
 INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time)
 VALUES ('1470241235099570177', '1432944556812075009', '信息交流会', '3', '', 3, 1, 'LKGLZ', '2021-12-13 11:56:40');
+
+UPDATE sys_dict_item SET dict_id='1465203901006192642', item_text='报名信息待审核', item_value='1', description='', sort_order=1, status=1, create_by='LKGLZ', create_time='2021-11-29 14:20:51', update_by='LKGLZ', update_time='2021-12-14 11:53:52' WHERE id='1465204088109899777';
+UPDATE sys_dict_item SET dict_id='1465203901006192642', item_text='凭证待审核', item_value='2', description='', sort_order=2, status=1, create_by='LKGLZ', create_time='2021-11-2914:48:51', update_by='LKGLZ', update_time='2021-12-14 11:58:34' WHERE id='1465211133961805825';
+UPDATE sys_dict_item SET dict_id='1465203901006192642', item_text='待签到', item_value='6', description='', sort_order=6, status=1, create_by='LKGLZ', create_time='2021-11-2914:21:59', update_by='LKGLZ', update_time='2021-12-14 11:59:49' WHERE id='1465204373351931906';
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1470604504423297026', '1465203901006192642', '已签到', '7', '', 7, 1, 'LKGLZ', '2021-12-14 12:00:11' );

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

@@ -124,10 +124,12 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             meeting.setDirectorName(user.getRealname());
             meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
             //    查询用户是否已报名此会议
-            LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
+            String situationId = meeting.getSituationId();
-            wrapper.eq(PayMeetingSituation::getMeetingId, meeting.getId());
+            PayMeetingSituation meetingSituation = payMeetingSituationService.getById(situationId);
-            wrapper.eq(PayMeetingSituation::getCompanyContactId, contactId);
+            //LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
-            PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(wrapper);
+            //wrapper.eq(PayMeetingSituation::getMeetingId, meeting.getId());
+            //wrapper.eq(PayMeetingSituation::getCompanyContactId, contactId);
+            //PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(wrapper);
             if (meetingSituation!=null) {
                 meeting.setMeetingSignUpType(2);
                 Integer registerCheckResult = meetingSituation.getRegisterCheckResult();
@@ -136,6 +138,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 meeting.setPayMode(meetingSituation.getPayMode());
                 Integer checkResult = meetingSituation.getCheckResult();
                 String paymentRecord = meetingSituation.getPaymentRecord();
+                Integer checkIn = meetingSituation.getCheckIn();
                 //报名信息审核中：非成员单位需要审核的
                 if (Objects.equals(registerCheckResult,0)){
                     meeting.setSignUpStatus(1);
@@ -155,7 +158,10 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 //    凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
                 }else if (Objects.equals(checkResult,2)){
                     meeting.setSignUpStatus(5);
-                //    报名成功：不需要审核直接报名成功的;审核凭证通过的
+                //签到成功的
+                }else if (Objects.equals(checkIn,1)){
+                    meeting.setSignUpStatus(7);
+                    //    报名成功：不需要审核直接报名成功的;审核凭证通过的
                 }else if (Objects.equals(checkResult,1)){
                     meeting.setSignUpStatus(6);
                 }
@@ -252,7 +258,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         String meetingType = meeting.getMeetingType().toString();
         //String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
         payMeetingVO.setMeetingType(meetingType);
-        payMeetingVO.setTbMeetingType(meeting.getTbMeetingType().toString());
+        if (meeting.getTbMeetingType()!=null) {
+            payMeetingVO.setTbMeetingType(meeting.getTbMeetingType().toString());
+        }
         //payMeetingVO.setHotelContactsList(new ArrayList<>());
         //会议查询酒店联系人列表
         LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();

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

@@ -294,28 +294,17 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
                     BeanUtils.copyProperties(meetingSituation, committeeSituationExcel);
                     exportList.add(committeeSituationExcel);
                     break;
+                case MeetingCommon.COUNCIL_MEETING:
+                    //保存数据
+                    CouncilSituationExcel councilSituationExcel = new CouncilSituationExcel();
+                    BeanUtils.copyProperties(meetingSituation, councilSituationExcel);
+                    exportList.add(councilSituationExcel);
+                    break;
             }
         }
 
 
-        Class<?> classToExport = null;
+        Class<?> classToExport = payMeetingSituationService.getaClass(Integer.parseInt(meetingType));
-        switch (meetingType) {
-            case MeetingCommon.WORKING_GROUP_MEETING:
-                classToExport = WorkingGroupSituationExcel.class;
-                break;
-            case MeetingCommon.STANDARD_MEETING:
-                classToExport = StandardsSituationExcel.class;
-                break;
-            case MeetingCommon.INTERNATIONAL_MEETING:
-                classToExport = InternationalSituationExcel.class;
-                break;
-            case MeetingCommon.OTHER_MEETING:
-                classToExport = SituationExcel.class;
-                break;
-            case MeetingCommon.COMMITTEE_MEETING:
-                classToExport = CommitteeSituationExcel.class;
-                break;
-        }
         return super.exportListXls(exportList, classToExport, "参会人员信息");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java

@@ -430,4 +430,8 @@ public class PayMeetingSituation implements Serializable {
 
     @TableField(exist = false)
     private Boolean isZero;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "报名流程")
+    private Integer registerProcess;
 }

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

@@ -307,11 +307,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 throw new JeroBootException("会议费用为0时，不可上传收款二维码");
             }
         }
-        //校验酒店信息
-        for (PayMeetingHotelContacts hotelContacts : hotelContactsList) {
-            ValidUtil.validate(hotelContacts, StandardMeeting.class);
-        }
-
         //根据会议类型进行校验
         switch (meetingType) {
             case MeetingCommon.WORKING_GROUP_MEETING:
@@ -375,7 +370,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 break;
             default:
         }
-
+        //校验酒店信息
+        if (hotelContactsList==null){
+            throw new JeroBootException("酒店信息不能为空");
+        }
+        for (PayMeetingHotelContacts hotelContacts : hotelContactsList) {
+            ValidUtil.validate(hotelContacts, StandardMeeting.class);
+        }
         BeanUtils.copyProperties(payMeetingVO, payMeeting);
         return payMeeting;
     }
@@ -655,6 +656,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 case 5:
                     queryWrapper.eq("pms.check_result",2);
                     break;
+                case 7:
+                    queryWrapper.eq("pms.check_in",1);
+                    break;
                 case 6:
                     queryWrapper.eq("pms.check_result",1);
                     break;
@@ -696,7 +700,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                             .or()
                             .eq("pm.meeting_type",MeetingCommon.OTHER_MEETING)
             );
-            queryWrapper.groupBy("meeting_name");
             return baseMapper.pageListContract3(page, queryWrapper, now);
         }
     }

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

@@ -35,7 +35,10 @@ import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
+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.mail.entity.PayMailBill;
 import com.jero.mail.service.IPayMailBillService;
 import com.jero.meeting.common.MeetingCommon;
@@ -117,6 +120,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     @Resource
     private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
     @Resource
+    private IPayCaseCouncilService payCaseCouncilService;
+    @Resource
+    private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
+    @Resource
     private SendMessageService sendMessageService;
     @Resource
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
@@ -789,9 +796,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     public IPage<PayMeetingSituation> pageListContract(Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper,Integer meetingType) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = loginUser.getId();
-        queryWrapper.eq("pm.meeting_type",meetingType);
+        queryWrapper.eq("pm.meeting_type", meetingType);
         if (!rolePermissionService.getRolePermission("committeeMeetingSituation:search")) {
-            if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){
+            if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)) {
                 queryWrapper.and(
                         a -> a.eq("pms.dock_id", userId)
                                 .or()
@@ -801,21 +808,20 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                                 .or()
                                 .eq("pwg.principal_id_b", userId)
                 );
-                return baseMapper.pageListContractWorkGroup(page,queryWrapper);
+                return baseMapper.pageListContractWorkGroup(page, queryWrapper);
             }
-            if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){
+            if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) {
                 queryWrapper.and(
                         a -> a.eq("pms.dock_id", userId)
                                 .or()
                                 .eq("pm.director_id", userId)
                 );
-                return baseMapper.pageListContract(page,queryWrapper);
+            } else {
-            }else {
                 queryWrapper.eq("pm.director_id", userId);
-                return baseMapper.pageListContract(page,queryWrapper);
             }
+            return baseMapper.pageListContract(page, queryWrapper);
         }
-        return baseMapper.pageListContract(page,queryWrapper);
+        return baseMapper.pageListContract(page, queryWrapper);
     }
 
     /**
@@ -1072,7 +1078,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
 
             //如果是标协会议判断会员类型
-            if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+            if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
                 //根据企业名称和会员类型不为null判断是否为标协会员
                 //如果是标协会员就存入会议费用（标协会员）
                 if (checkMember) {
@@ -1114,8 +1120,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             BeanUtils.copyProperties(commonGuestVO, payMeetingSituation1);
         }
         payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
-        //如果是工作组会议或者分标委会议，判断是否为成员
+        //如果是工作组会议或者分标委会议或理事会会议，判断是否为成员
-        if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
+        if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)) {
             LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId());
             wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
@@ -1129,7 +1135,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (count <= 0) {
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
-        } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
+        } else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) {
             LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());
             wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId());
@@ -1138,6 +1144,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (count <= 0) {
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
+        } else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)) {
+            LambdaQueryWrapper<PayCaseCouncilSubitem> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayCaseCouncilSubitem::getCouncilId, payMeeting.getCouncilId());
+            wrapper.eq(PayCaseCouncilSubitem::getContactsId, payMeetingSituation1.getCompanyContactId());
+            int count = payCaseCouncilSubitemService.count(wrapper);
+            if (count <= 0) {
+                payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+            }
         }
         return payMeetingSituation1;
     }
@@ -1252,6 +1266,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             PayIncomeContract incomeContract = payIncomeContractService.getById(contractId);
             meetingSituation.setContractNum(incomeContract.getContractNum());
         }
+        BigDecimal amountReceivable = meetingSituation.getAmountReceivable();
+        //不需要缴费
+        if (amountReceivable==null||amountReceivable.compareTo(new BigDecimal(0)) == 0){
+
+        }else {
+
+        }
+
         return meetingSituation;
     }
 
@@ -1413,6 +1435,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     BeanUtils.copyProperties(meetingSituation, committeeSituationExcel);
                     exportList.add(committeeSituationExcel);
                     break;
+                case MeetingCommon.COUNCIL_MEETING:
+                    //保存数据
+                    CouncilSituationExcel councilSituationExcel = new CouncilSituationExcel();
+                    BeanUtils.copyProperties(meetingSituation, councilSituationExcel);
+                    exportList.add(councilSituationExcel);
+                    break;
             }
         }
 
@@ -1432,6 +1460,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             classToExport = SituationExcel.class;
         }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){
             classToExport = CommitteeSituationExcel.class;
+        }else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)){
+            classToExport = CouncilSituationExcel.class;
         }
         return classToExport;
     }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CouncilSituationExcel.java

@@ -0,0 +1,79 @@
+package com.jero.meeting.vo.excel;
+
+import com.jero.common.aspect.annotation.Dict;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @author liJiaRao
+ * @date 2021-09-22 15:39
+ */
+@Data
+public class CouncilSituationExcel extends SituationBaseExcel {
+
+    /**会议id*/
+    @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")
+    private String meetingId;
+
+    /**企业id*/
+    @Excel(name = "企业名称", width = 15)
+    private String companyName;
+
+    /**企业联系人id*/
+    @Excel(name = "企业联系人名称", width = 15)
+    private String companyContactName;
+
+    /**职务*/
+    @Excel(name = "职务", width = 15)
+    private String post;
+
+    /**手机号*/
+    @Excel(name = "手机号", width = 15)
+    private String phone;
+
+    /**邮箱*/
+    @Excel(name = "邮箱", width = 15)
+    private String email;
+
+    /**身份*/
+    @Dict(dicCode = "meet_identify_type")
+    @Excel(name = "身份", width = 15,dicCode = "meet_identify_type")
+    private Integer identity;
+
+    /**是否入住协议酒店*/
+    @Excel(name = "是否入住酒店", width = 15,dicCode = "yn")
+    private Integer checkInHotel;
+
+    /**抵达时间*/
+    @Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd")
+    private java.util.Date arrivalTime;
+
+    /**离开时间*/
+    @Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd")
+    private java.util.Date departureTime;
+
+    /**邮寄联系人*/
+    @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
+    private String postContactId;
+
+    /**邮寄联系人地址*/
+    @Excel(name = "邮寄联系人地址", width = 15)
+    private String postContactAddress;
+
+    /**邮编*/
+    @Excel(name = "邮编", width = 15)
+    private String postCode;
+
+    /**缴费方式*/
+    @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
+    private Integer payMode;
+
+    /**需要发票*/
+    @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
+    private Integer needInvoice;
+
+    /**订单后4位编码*/
+    @Excel(name = "订单后4位编码", width = 15)
+    private String orderCode;
+
+}