LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 小程序默认会议列表全部时，展示未结束的会议

Browse Source
This commit is contained in:
lijiarao
2022-04-18 18:05:39 +08:00
parent 4dfbf82c2a
commit 54b1c4b089
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/2022-1-4变更.sql
+1 -1
View File
@@ -177,7 +177,7 @@ update sys_user set sys_user.work_no = (select sheet0.username from sheet0 where
DROP TABLE IF EXISTS `sheet0`;
--2022-04-12 合同变更
-- 2022-04-12 合同变更
alter TABLE pay_spending_contract ADD (phone VARCHAR(22) COMMENT '联系电话',address VARCHAR(255) COMMENT '邮寄地址',post_code VARCHAR(50) COMMENT '邮编');
alter TABLE pay_mail_contract ADD (contract_type TINYINT(2) COMMENT '合同类型：1 支出合同，2 收入合同');
INSERT INTO `sys_dict` VALUES ('1509830472616779778', '合同类型', 'contract_type', '（1：支出合同，2：收入合同）', 0, 'LKGLZ', '2022-04-01 17:50:11', 'LKGLZ', '2022-04-01 17:51:38', 0);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+9 -8
View File
@@ -728,10 +728,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.orderByDesc("start_time");
//会议分类：1可报名/2已报名/3全部
String meetingSignUpType = request.getParameter("meetingSignUpType");
//会议报名状态
Integer signUpStatus = payMeeting.getSignUpStatus();
if (Objects.nonNull(signUpStatus)) {
switch (signUpStatus){
@@ -776,9 +773,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
// break;
}
}
//可报名或者报名状态选择可报名 1可报名/2已报名
if (Objects.equals(meetingSignUpType, 1 + "")||Objects.equals(signUpStatus,8)) {
//会议分类：1可报名/2已报名/3全部
Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
//可报名或者报名状态选择可报名 1可报名/2已报名/3全部/4 app全部(可报名和进行中)
if (Objects.equals(meetingSignUpType, 1)||Objects.equals(signUpStatus,8)) {
//queryWrapper.ne("pms.company_contact_id",contactId);
queryWrapper.ge("register_deadline", now);
queryWrapper.ge("end_time", now);
@@ -790,10 +788,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.groupBy("meeting_name");
queryWrapper.having("company_contact_ids not like concat('%',{0},'%') or company_contact_ids is null",contactId);
return baseMapper.pageListContract(page, queryWrapper, now);
} else if (Objects.equals(meetingSignUpType, 2 + "")) {
} else if (Objects.equals(meetingSignUpType, 2 )) {
queryWrapper.eq("pms.company_contact_id", contactId);
return baseMapper.pageListContract2(page, queryWrapper, now);
} else {
} else if (Objects.equals(meetingSignUpType, 3)){
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
}else {
queryWrapper.lt("end_time", now);
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
}
}