Merge remote-tracking branch 'origin/branch20211008' into branch20211008
This commit is contained in:
梁琦涛
+21
-6
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@
|
||||
ail.fileName like concat('%',concat(#{fileName},'%'))
|
||||
</if>
|
||||
</where>
|
||||
order by ail.uploadTime desc
|
||||
group by ail.fileId order by ail.uploadTime desc
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
+5
-5
@@ -575,7 +575,7 @@
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="ids!= null and ids != ''"> where pwgs.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<if test="ids!= null and ids != ''"> pwgs.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
|
||||
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
|
||||
AND pwg.working_group_project LIKE
|
||||
@@ -630,7 +630,7 @@
|
||||
FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd
|
||||
on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="ids!= null and ids != ''"> where pcp.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<if test="ids!= null and ids != ''"> pcp.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
|
||||
<if test="idList != null and idList != ''">
|
||||
pcp.principal_id in
|
||||
@@ -692,7 +692,7 @@
|
||||
FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
|
||||
left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="ids!= null and ids != ''"> where pmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<if test="ids!= null and ids != ''"> pmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
|
||||
<if test="idList != null and idList != ''">
|
||||
pmp.director_id in
|
||||
@@ -753,7 +753,7 @@
|
||||
FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id)
|
||||
left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="ids!= null and ids != ''"> where pms.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<if test="ids!= null and ids != ''"> pms.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
|
||||
<if test="idList != null and idList != ''">
|
||||
pm.director_id in
|
||||
@@ -814,7 +814,7 @@
|
||||
FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
|
||||
left JOIN sys_user su on(tmps.liaison_man_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="ids!= null and ids != ''"> where tmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<if test="ids!= null and ids != ''"> tmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<!--标协项目没有负责人所以除最高权限都查不到 -->
|
||||
<if test="idList != null and idList != ''">
|
||||
tmps.id=99999999999999999999999
|
||||
|
||||
Reference in New Issue
Block a user