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

fix 修改没有部门后会议查不出来的bug

Browse Source
This commit is contained in:
lijiarao
2021-10-19 17:30:30 +08:00
parent e3257bf4be
commit ad6af73b3d
15 changed files with 97 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+5 -7
View File
@@ -115,9 +115,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -216,7 +215,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -267,9 +266,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+4 -7
View File
@@ -115,9 +115,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -216,7 +214,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -267,9 +265,8 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+5 -7
View File
@@ -115,9 +115,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -216,7 +215,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -267,9 +266,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+5 -7
View File
@@ -211,9 +211,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
// 查询用户是否已报名此会议
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
@@ -305,7 +304,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -355,9 +354,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+5 -7
View File
@@ -115,9 +115,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -216,7 +215,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -267,9 +266,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+4 -39
View File
@@ -93,42 +93,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.WORKING_GROUP_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
);
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
queryWrapper.not(
a -> a.lt("end_time", meetingStartTime)
);
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
//查询酒店联系人列表
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
meeting.setHotelContactsList(payMeetingHotelContactsList);
}
}
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
return Result.OK(pageList);
}
@@ -216,7 +182,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -267,9 +233,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
+3
View File
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.meeting.vo.PayMeetingVO;
import com.jero.meeting.vo.PublishReminderVO;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -65,4 +66,6 @@ public interface IPayMeetingService extends IService<PayMeeting> {
IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper, String now);
IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+43
View File
@@ -1,5 +1,6 @@
package com.jero.meeting.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,6 +12,7 @@ import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
@@ -56,6 +58,8 @@ import java.util.Objects;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -486,4 +490,43 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
public IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper, String now) {
return baseMapper.pageListContract(page,queryWrapper,now);
}
@Override
public IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
);
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
queryWrapper.not(
a -> a.lt("end_time", meetingStartTime)
);
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
//查询酒店联系人列表
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
meeting.setHotelContactsList(payMeetingHotelContactsList);
}
}
return pageList;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+2 -6
View File
@@ -81,9 +81,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
for (PayMemberProject memberProject : memberProjectPage.getRecords()) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
memberProject.setDirectorName(user.getRealname() + "(" + departName + ")");
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return Result.OK(memberProjectPage);
}
@@ -261,9 +259,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
}
for (PayMemberProject memberProject : pageList) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
memberProject.setDirectorName(user.getRealname() + "(" + departName + ")");
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return super.exportListXls(pageList, PayMemberProject.class, "会员项目表");
}
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+2 -3
View File
@@ -97,9 +97,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) {
//DirectorName存的是id
LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
memberProjectSubitem.setDirectorName(user.getRealname() + "(" + departName + ")");
memberProjectSubitem.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return Result.OK(pageList);
}