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

add 企业端我的会议返回可报名信息meetingSignUpType

Browse Source
This commit is contained in:
lijiarao
2021-10-18 10:21:52 +08:00
parent 93c606b622
commit 450342c7df
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+21 -6
View File
@@ -26,11 +26,13 @@ import com.jero.data.service.IPayCaseCommitteeService;
import com.jero.meeting.common.MeetingCommon;
import com.jero.meeting.entity.PayMeeting;
import com.jero.meeting.entity.PayMeetingHotelContacts;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingHotelContactsService;
import com.jero.meeting.service.IPayMeetingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.meeting.vo.PayMeetingVO;
import com.jero.meeting.vo.PublishReminderVO;
import com.jero.meeting.vo.UploadFileVO;
@@ -83,6 +85,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
private IPayCaseCommitteeService payCaseCommitteeService;
@Resource
private IPayContactsManagementService payContactsManagementService;
@Resource
private IPayMeetingSituationService payMeetingSituationService;
/**
* 分页列表查询
@@ -182,21 +186,22 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = sysUser.getId();
String contactId = sysUser.getId();
//会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType, 1 + "")) {
queryWrapper.eq("pmrr.contact_id", id);
queryWrapper.eq("pmrr.contact_id", contactId);
queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
} else if (Objects.equals(meetingSignUpType, 2 + "")) {
queryWrapper.eq("pms.company_contact_id", id);
queryWrapper.eq("pms.company_contact_id", contactId);
} else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id", id)
a -> a.eq("pms.company_contact_id", contactId)
.or()
.eq("pms.post_contact_id", id)
.eq("pms.post_contact_id", contactId)
.or()
.eq("pmrr.contact_id", id)
.eq("pmrr.contact_id", contactId)
);
}
@@ -210,6 +215,16 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
// 查询用户是否已报名此会议
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingSituation::getMeetingId,meeting.getId());
wrapper.eq(PayMeetingSituation::getCompanyContactId,contactId);
int count = payMeetingSituationService.count(wrapper);
if (count > 0){
meeting.setMeetingSignUpType(2);
}else {
meeting.setMeetingSignUpType(1);
}
}
return Result.OK(pageList);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+6
View File
@@ -282,4 +282,10 @@ public class PayMeeting implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM")
@DateTimeFormat(pattern="yyyy-MM")
private Date month;
/**
* 会议可报名状态：1可报名/2已报名
*/
@TableField(exist = false)
private Integer meetingSignUpType;
}