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

fix 负责人回显

Browse Source
This commit is contained in:
lijiarao
2021-10-21 16:02:59 +08:00
parent e429853f64
commit 83766f29ec
9 changed files with 760 additions and 758 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 -5
View File
@@ -93,7 +93,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT); payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -181,7 +181,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0); String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -233,7 +233,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -319,14 +319,14 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "上传资料", notes = "上传资料") @ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) { public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.COMMITTEE_MEETING_INT); payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
/** /**
* 发布提醒 * 发布提醒
*/ */
@AutoLog(value = "发布提醒",operateType = 2) @AutoLog(value = "发布提醒", operateType = 2)
@RequiresPermissions("committeeMeeting:publish") @RequiresPermissions("committeeMeeting:publish")
@ApiOperation(value = "发布提醒", notes = "发布提醒") @ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder") @PostMapping(value = "/publishReminder")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+4 -4
View File
@@ -93,7 +93,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT); payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT);
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -181,7 +181,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0); String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -233,7 +233,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -319,7 +319,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@ApiOperation(value = "上传资料", notes = "上传资料") @ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) { public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.INTERNATIONAL_MEETING_INT); payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT);
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+4 -4
View File
@@ -93,7 +93,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT); payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT);
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -181,7 +181,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0); String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -233,7 +233,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -319,7 +319,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@ApiOperation(value = "上传资料", notes = "上传资料") @ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) { public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.OTHER_MEETING_INT); payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT);
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+9 -9
View File
@@ -110,7 +110,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -192,16 +192,16 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
// 查询用户是否已报名此会议 // 查询用户是否已报名此会议
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingSituation::getMeetingId,meeting.getId()); wrapper.eq(PayMeetingSituation::getMeetingId, meeting.getId());
wrapper.eq(PayMeetingSituation::getCompanyContactId,contactId); wrapper.eq(PayMeetingSituation::getCompanyContactId, contactId);
int count = payMeetingSituationService.count(wrapper); int count = payMeetingSituationService.count(wrapper);
if (count > 0){ if (count > 0) {
meeting.setMeetingSignUpType(2); meeting.setMeetingSignUpType(2);
}else { } else {
meeting.setMeetingSignUpType(1); meeting.setMeetingSignUpType(1);
} }
} }
@@ -284,7 +284,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0); String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -335,7 +335,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -422,7 +422,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
@Transactional @Transactional
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) { public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.INTERNATIONAL_MEETING_INT); payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT);
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+4 -4
View File
@@ -93,7 +93,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT); payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT);
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -181,7 +181,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0); String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -233,7 +233,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -319,7 +319,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "上传资料", notes = "上传资料") @ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) { public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.STANDARD_MEETING_INT); payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT);
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+4 -4
View File
@@ -94,7 +94,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
HttpServletRequest req) { HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.WORKING_GROUP_MEETING_INT); payMeeting.setMeetingType(MeetingCommon.WORKING_GROUP_MEETING_INT);
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -182,7 +182,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0); String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -234,7 +234,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO); BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -320,7 +320,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "上传资料", notes = "上传资料") @ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) { public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.WORKING_GROUP_MEETING_INT); payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT);
return Result.OK("上传资料成功!"); return Result.OK("上传资料成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+51 -48
View File
@@ -109,6 +109,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
private IOSSFileService iossFileService; private IOSSFileService iossFileService;
@Resource @Resource
private Environment env; private Environment env;
/** /**
* 新增会议 * 新增会议
*/ */
@@ -117,10 +118,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//酒店联系人列表 //酒店联系人列表
List<PayMeetingHotelContacts> hotelContactsList = payMeetingVO.getHotelContactsList(); List<PayMeetingHotelContacts> hotelContactsList = payMeetingVO.getHotelContactsList();
//进行校验，赋值操作 //进行校验，赋值操作
PayMeeting payMeeting = getPayMeeting(payMeetingVO,hotelContactsList); PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList);
save(payMeeting); save(payMeeting);
//如果酒店联系人列表不为空，就新增 //如果酒店联系人列表不为空，就新增
if (!CollectionUtils.isEmpty(hotelContactsList)){ if (!CollectionUtils.isEmpty(hotelContactsList)) {
String meetingId = payMeeting.getId(); String meetingId = payMeeting.getId();
hotelContactsList.forEach(hotelContacts -> hotelContactsList.forEach(hotelContacts ->
hotelContacts.setMeetingId(meetingId) hotelContacts.setMeetingId(meetingId)
@@ -129,13 +130,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
} }
//新增会员系统标协会议 //新增会员系统标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.add(payMeeting,hotelContactsList); stableCrossTrainingService.add(payMeeting, hotelContactsList);
} }
//工作组会议发送通知 //工作组会议发送通知
if (Objects.equals(payMeeting.getMeetingType(),Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))){ if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
String workingGroupId = payMeeting.getWorkingGroupId(); String workingGroupId = payMeeting.getWorkingGroupId();
LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,workingGroupId); wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, workingGroupId);
List<PayWorkingGroupSubItem> groupSubItemList = payWorkingGroupSubItemService.list(wrapper); List<PayWorkingGroupSubItem> groupSubItemList = payWorkingGroupSubItemService.list(wrapper);
for (PayWorkingGroupSubItem payWorkingGroupSubItem : groupSubItemList) { for (PayWorkingGroupSubItem payWorkingGroupSubItem : groupSubItemList) {
String chargeCompanyId = payWorkingGroupSubItem.getChargeCompanyId(); String chargeCompanyId = payWorkingGroupSubItem.getChargeCompanyId();
@@ -150,8 +151,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
} }
} }
} }
/** /**
* 工作组创建会议通知 * 工作组创建会议通知
*
* @param payMeeting 会议信息 * @param payMeeting 会议信息
* @param payContactsManagement 联系人信息 * @param payContactsManagement 联系人信息
* @author lijiarao * @author lijiarao
@@ -175,7 +178,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
sendMessageDTO.setTemplateParam(map); sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE1"); sendMessageDTO.setBusType("C_OPEN_TYPE1");
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("id",payMeeting.getId()); jsonObject.put("id", payMeeting.getId());
sendMessageDTO.setBusId(jsonObject.toJSONString()); sendMessageDTO.setBusId(jsonObject.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageService.SendMessageService(sendMessageDTO);
} }
@@ -185,11 +188,11 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
saveOrUpdate(payMeeting); saveOrUpdate(payMeeting);
List<PayMeetingHotelContacts> hotelContactsList = payMeeting.getHotelContactsList(); List<PayMeetingHotelContacts> hotelContactsList = payMeeting.getHotelContactsList();
//如果酒店联系人列表不为空，就新增 //如果酒店联系人列表不为空，就新增
if (!CollectionUtils.isEmpty(hotelContactsList)){ if (!CollectionUtils.isEmpty(hotelContactsList)) {
String meetingId = payMeeting.getId(); String meetingId = payMeeting.getId();
//先删除原先的酒店联系人，在添加新的 //先删除原先的酒店联系人，在添加新的
LambdaQueryWrapper<PayMeetingHotelContacts> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingHotelContacts> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayMeetingHotelContacts::getMeetingId,meetingId); queryWrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId);
meetingHotelContactsService.remove(queryWrapper); meetingHotelContactsService.remove(queryWrapper);
hotelContactsList.forEach(hotelContacts -> hotelContactsList.forEach(hotelContacts ->
hotelContacts.setMeetingId(meetingId) hotelContacts.setMeetingId(meetingId)
@@ -208,11 +211,11 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList); PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList);
saveOrUpdate(payMeeting); saveOrUpdate(payMeeting);
//如果酒店联系人列表不为空，就更新 //如果酒店联系人列表不为空，就更新
if (!CollectionUtils.isEmpty(hotelContactsList)){ if (!CollectionUtils.isEmpty(hotelContactsList)) {
String meetingId = payMeeting.getId(); String meetingId = payMeeting.getId();
//先删除原先的酒店联系人，在添加新的 //先删除原先的酒店联系人，在添加新的
LambdaQueryWrapper<PayMeetingHotelContacts> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingHotelContacts> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayMeetingHotelContacts::getMeetingId,meetingId); queryWrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId);
meetingHotelContactsService.remove(queryWrapper); meetingHotelContactsService.remove(queryWrapper);
hotelContactsList.forEach(hotelContacts -> hotelContactsList.forEach(hotelContacts ->
hotelContacts.setMeetingId(meetingId) hotelContacts.setMeetingId(meetingId)
@@ -221,7 +224,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
} }
//编辑标协会议 //编辑标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.edit(payMeeting,hotelContactsList); stableCrossTrainingService.edit(payMeeting, hotelContactsList);
} }
} }
@@ -231,12 +234,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//判断会议名称 //判断会议名称
String meetingName = payMeetingVO.getMeetingName(); String meetingName = payMeetingVO.getMeetingName();
LambdaQueryWrapper<PayMeeting> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeeting> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeeting::getMeetingName,meetingName); wrapper.eq(PayMeeting::getMeetingName, meetingName);
String id = payMeetingVO.getId(); String id = payMeetingVO.getId();
if (id !=null){ if (id != null) {
wrapper.ne(PayMeeting::getId,id); wrapper.ne(PayMeeting::getId, id);
} }
if (count(wrapper)>0){ if (count(wrapper) > 0) {
throw new JeroBootException("会议名称不能重复"); throw new JeroBootException("会议名称不能重复");
} }
//判断会议类型 //判断会议类型
@@ -244,7 +247,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
String type = sysBaseAPI.translateDict("meeting_type", meetingType); String type = sysBaseAPI.translateDict("meeting_type", meetingType);
if (StrUtil.isBlank(type)) { if (StrUtil.isBlank(type)) {
throw new JeroBootException("会议类型不存在"); throw new JeroBootException("会议类型不存在");
}else { } else {
payMeeting.setMeetingType(Integer.valueOf(meetingType)); payMeeting.setMeetingType(Integer.valueOf(meetingType));
} }
//判断会议联系人 //判断会议联系人
@@ -252,13 +255,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
LoginUser loginUser = sysBaseAPI.getUserById(directorId); LoginUser loginUser = sysBaseAPI.getUserById(directorId);
if (loginUser == null) { if (loginUser == null) {
throw new JeroBootException("会议负责人不存在"); throw new JeroBootException("会议负责人不存在");
}else{ } else {
payMeetingVO.setDirectorName(loginUser.getUsername()); payMeetingVO.setDirectorName(loginUser.getUsername());
payMeetingVO.setDirectorPhone(loginUser.getPhone()); payMeetingVO.setDirectorPhone(loginUser.getPhone());
} }
//如果会议费用为0则不可上传收款二维码 //如果会议费用为0则不可上传收款二维码
if (payMeetingVO.getMeetingCosts().compareTo(BigDecimal.ZERO) < 1){ if (payMeetingVO.getMeetingCosts().compareTo(BigDecimal.ZERO) < 1) {
if (StringUtils.isNotBlank(payMeetingVO.getPaymentQrCode())){ if (StringUtils.isNotBlank(payMeetingVO.getPaymentQrCode())) {
throw new JeroBootException("会议费用为0时，不可上传收款二维码"); throw new JeroBootException("会议费用为0时，不可上传收款二维码");
} }
} }
@@ -269,7 +272,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
ValidUtil.validate(payMeetingVO, WorkingGroupMeeting.class); ValidUtil.validate(payMeetingVO, WorkingGroupMeeting.class);
String workingGroupId = payMeetingVO.getWorkingGroupId(); String workingGroupId = payMeetingVO.getWorkingGroupId();
PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId); PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId);
if (workingGroup == null){ if (workingGroup == null) {
throw new JeroBootException("工作组项目不存在"); throw new JeroBootException("工作组项目不存在");
} }
payMeetingVO.setRemind(MeetingCommon.REMIND_0); payMeetingVO.setRemind(MeetingCommon.REMIND_0);
@@ -279,7 +282,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//标协会议类型 //标协会议类型
String tbMeetingType = payMeetingVO.getTbMeetingType(); String tbMeetingType = payMeetingVO.getTbMeetingType();
String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType); String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
if (standardMeetingType == null){ if (standardMeetingType == null) {
throw new JeroBootException("标协会议类型不存在"); throw new JeroBootException("标协会议类型不存在");
} }
payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType)); payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType));
@@ -317,7 +320,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class); ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class);
String caseCommitteeId = payMeetingVO.getCaseCommitteeId(); String caseCommitteeId = payMeetingVO.getCaseCommitteeId();
PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(caseCommitteeId); PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(caseCommitteeId);
if (payCaseCommittee == null){ if (payCaseCommittee == null) {
throw new JeroBootException("分标委项目不存在"); throw new JeroBootException("分标委项目不存在");
} }
payMeetingVO.setRemind(MeetingCommon.REMIND_0); payMeetingVO.setRemind(MeetingCommon.REMIND_0);
@@ -325,7 +328,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
default: default:
} }
BeanUtils.copyProperties(payMeetingVO,payMeeting); BeanUtils.copyProperties(payMeetingVO, payMeeting);
return payMeeting; return payMeeting;
} }
@@ -335,7 +338,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
Integer integer = payMeetingSituationService.countByMeetingId(id); Integer integer = payMeetingSituationService.countByMeetingId(id);
if (integer>0){ if (integer > 0) {
throw new JeroBootException("该会议有参会人无法删除"); throw new JeroBootException("该会议有参会人无法删除");
} }
PayMeeting payMeeting = getById(id); PayMeeting payMeeting = getById(id);
@@ -344,7 +347,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
} }
removeById(id); removeById(id);
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingHotelContacts::getMeetingId,id); wrapper.eq(PayMeetingHotelContacts::getMeetingId, id);
meetingHotelContactsService.remove(wrapper); meetingHotelContactsService.remove(wrapper);
} }
@@ -356,13 +359,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
List<String> meetingList = new ArrayList<>(); List<String> meetingList = new ArrayList<>();
for (String id : ids) { for (String id : ids) {
Integer integer = payMeetingSituationService.countByMeetingId(id); Integer integer = payMeetingSituationService.countByMeetingId(id);
if (integer>0){ if (integer > 0) {
PayMeeting payMeeting = getById(id); PayMeeting payMeeting = getById(id);
meetingList.add(payMeeting.getMeetingName()); meetingList.add(payMeeting.getMeetingName());
} }
} }
if (meetingList.size()>0){ if (meetingList.size() > 0) {
throw new JeroBootException(meetingList+"会议下有参会人，无法删除"); throw new JeroBootException(meetingList + "会议下有参会人，无法删除");
} }
for (String id : ids) { for (String id : ids) {
PayMeeting payMeeting = getById(id); PayMeeting payMeeting = getById(id);
@@ -372,7 +375,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
} }
removeByIds(ids); removeByIds(ids);
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.in(PayMeetingHotelContacts::getMeetingId,ids); wrapper.in(PayMeetingHotelContacts::getMeetingId, ids);
meetingHotelContactsService.remove(wrapper); meetingHotelContactsService.remove(wrapper);
} }
@@ -407,7 +410,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
LambdaQueryWrapper<PayContactsManagement> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayContactsManagement> wrapper = new LambdaQueryWrapper<>();
List<String> contactsIdList = new ArrayList<>(); List<String> contactsIdList = new ArrayList<>();
//工作组项目查询公司 //工作组项目查询公司
if (Objects.equals(projectType,1)){ if (Objects.equals(projectType, 1)) {
List<PayWorkingGroupSubItem> payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds); List<PayWorkingGroupSubItem> payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds);
//把单位会员中所有的联系人取出 //把单位会员中所有的联系人取出
for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) { for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) {
@@ -441,7 +444,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
} }
} }
// 分标委项目查询人 // 分标委项目查询人
}else if (Objects.equals(projectType,2)){ } else if (Objects.equals(projectType, 2)) {
List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemService.listByIds(subitemIds); List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemService.listByIds(subitemIds);
for (PayCaseCommitteeSubitem payCaseCommitteeSubitem : payCaseCommitteeSubitems) { for (PayCaseCommitteeSubitem payCaseCommitteeSubitem : payCaseCommitteeSubitems) {
String committeeSubitemId = payCaseCommitteeSubitem.getId(); String committeeSubitemId = payCaseCommitteeSubitem.getId();
@@ -453,10 +456,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
.setContactId(contactsId) .setContactId(contactsId)
); );
} }
}else { } else {
throw new JeroBootException("项目类型不正确"); throw new JeroBootException("项目类型不正确");
} }
wrapper.in(PayContactsManagement::getId,contactsIdList); wrapper.in(PayContactsManagement::getId, contactsIdList);
List<PayContactsManagement> list = payContactsManagementService.list(wrapper); List<PayContactsManagement> list = payContactsManagementService.list(wrapper);
//标记会议为已提醒 //标记会议为已提醒
@@ -475,11 +478,11 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
String phone = payContactsManagement.getPhone(); String phone = payContactsManagement.getPhone();
SendMessageDTO sendMessageDTO = new SendMessageDTO(); SendMessageDTO sendMessageDTO = new SendMessageDTO();
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
if (StringUtils.isNotBlank(payMeeting.getNotice())){ if (StringUtils.isNotBlank(payMeeting.getNotice())) {
sendMessageDTO.setMeetingNotice(payMeeting.getNotice()); sendMessageDTO.setMeetingNotice(payMeeting.getNotice());
} }
map.put("meetingName",payMeeting.getMeetingName()); map.put("meetingName", payMeeting.getMeetingName());
map.put("busId",meetingId); map.put("busId", meetingId);
sendMessageDTO.setEmail(PasswordUtil.decrypt(email)); sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone)); sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone)); sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
@@ -489,24 +492,24 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
sendMessageDTO.setTemplateParam(map); sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE1"); sendMessageDTO.setBusType("C_OPEN_TYPE1");
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("id",meetingId); jsonObject.put("id", meetingId);
sendMessageDTO.setBusId(jsonObject.toJSONString()); sendMessageDTO.setBusId(jsonObject.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageService.SendMessageService(sendMessageDTO);
} }
} }
payMeetingRemindRecordService.addList(meetingIdList,meetingRemindRecordList); payMeetingRemindRecordService.addList(meetingIdList, meetingRemindRecordList);
} }
@Override @Override
public IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper, String now) { public IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper, String now) {
return baseMapper.pageListContract(page,queryWrapper,now); return baseMapper.pageListContract(page, queryWrapper, now);
} }
@Override @Override
public IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) { public IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)){ if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) {
payMeeting.setDirectorId(sysUser.getId()); payMeeting.setDirectorId(sysUser.getId());
} }
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
@@ -531,7 +534,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
for (PayMeeting meeting : pageList.getRecords()) { for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting); BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -552,10 +555,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
String id = uploadFileVO.getId(); String id = uploadFileVO.getId();
PayMeeting payMeeting = getOne( PayMeeting payMeeting = getOne(
new LambdaQueryWrapper<PayMeeting>() new LambdaQueryWrapper<PayMeeting>()
.eq(PayMeeting::getId,id) .eq(PayMeeting::getId, id)
.eq(PayMeeting::getMeetingType,meetingCommon) .eq(PayMeeting::getMeetingType, meetingCommon)
); );
if (Objects.isNull(payMeeting)){ if (Objects.isNull(payMeeting)) {
throw new JeroBootException("会议不存在"); throw new JeroBootException("会议不存在");
} }
String fileIds = uploadFileVO.getFileIds(); String fileIds = uploadFileVO.getFileIds();
@@ -610,14 +613,14 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
PayContactsManagement payContactsManagement = payContactsManagementService.getById(contactId); PayContactsManagement payContactsManagement = payContactsManagementService.getById(contactId);
// 发送消息 // 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO(); SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payContactsManagement.getEmail())){ if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
} }
if(!StringUtils.isEmpty(payContactsManagement.getPhone())){ if (!StringUtils.isEmpty(payContactsManagement.getPhone())) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone())); sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
} }
HashMap<String,String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("meetingName", payMeeting.getMeetingName()); map.put("meetingName", payMeeting.getMeetingName());
sendMessageDTO.setFromUser(loginUser.getUsername()); sendMessageDTO.setFromUser(loginUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG7.getCode()); sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG7.getCode());
@@ -625,7 +628,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
sendMessageDTO.setListFile(listFile); sendMessageDTO.setListFile(listFile);
sendMessageDTO.setBusType("C_OPEN_TYPE7"); sendMessageDTO.setBusType("C_OPEN_TYPE7");
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("id",payMeeting.getId()); json.put("id", payMeeting.getId());
sendMessageDTO.setBusId(json.toJSONString()); sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageService.SendMessageService(sendMessageDTO);
} }
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+36 -36
View File
@@ -45,13 +45,13 @@ import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
/** /**
* @Description: 会员项目表 * @Description: 会员项目表
* @Author: jero-boot * @Author: jero-boot
* @Date: 2021-08-26 * @Date: 2021-08-26
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="会员项目表") @Api(tags = "会员项目表")
@RestController @RestController
@RequestMapping("/jero/memberProject") @RequestMapping("/jero/memberProject")
@Slf4j @Slf4j
@@ -72,14 +72,14 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
* 分页列表查询 * 分页列表查询
*/ */
@RequiresPermissions("memberProject:search") @RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-根据成员单位列表查询", notes="会员项目表-根据成员单位列表查询") @ApiOperation(value = "会员项目表-根据成员单位列表查询", notes = "会员项目表-根据成员单位列表查询")
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<?> queryPageList(PayMemberProject payMemberProject, public Result<?> queryPageList(PayMemberProject payMemberProject,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)){ if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) {
payMemberProject.setDirectorId(sysUser.getId()); payMemberProject.setDirectorId(sysUser.getId());
} }
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap()); QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
@@ -87,7 +87,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper); IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
for (PayMemberProject memberProject : memberProjectPage.getRecords()) { for (PayMemberProject memberProject : memberProjectPage.getRecords()) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); memberProject.setDirectorName(user.getRealname());
} }
return Result.OK(memberProjectPage); return Result.OK(memberProjectPage);
} }
@@ -104,7 +104,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
* @Exception * @Exception
*/ */
@RequiresPermissions("memberProject:search") @RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-收入合同列表分页查询", notes="会员项目表-收入合同列表分页查询") @ApiOperation(value = "会员项目表-收入合同列表分页查询", notes = "会员项目表-收入合同列表分页查询")
@GetMapping(value = "/queryListByCompany") @GetMapping(value = "/queryListByCompany")
public Result<?> queryListByCompany( public Result<?> queryListByCompany(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -112,34 +112,34 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@RequestParam(name = "companyId") String companyId, @RequestParam(name = "companyId") String companyId,
@RequestParam(name = "contractId") String contractId, @RequestParam(name = "contractId") String contractId,
@RequestParam(name = "projectType") String projectType, @RequestParam(name = "projectType") String projectType,
@RequestParam(name = "projectName",required = false) String projectName, @RequestParam(name = "projectName", required = false) String projectName,
@RequestParam(name = "memberName", required = false) String memberName) { @RequestParam(name = "memberName", required = false) String memberName) {
if(StringUtils.isBlank(companyId)){ if (StringUtils.isBlank(companyId)) {
return Result.error("企业id不能为空！"); return Result.error("企业id不能为空！");
} }
PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId); PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
if(Objects.isNull(payIncomeContract)){ if (Objects.isNull(payIncomeContract)) {
return Result.error("合同不存在！"); return Result.error("合同不存在！");
} }
// 会员 // 会员
if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE4)){ if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE4)) {
Page<PayMemberProject> page = new Page<>(pageNo, pageSize); Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
projectName = oConvertUtils.replaceAllPercent(projectName); projectName = oConvertUtils.replaceAllPercent(projectName);
IPage<PayMemberProject> list = memberProjectService.queryListByCompany(page,companyId,projectName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear()); IPage<PayMemberProject> list = memberProjectService.queryListByCompany(page, companyId, projectName, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear());
return Result.OK(list); return Result.OK(list);
} }
// 标协会员 // 标协会员
if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE5)){ if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE5)) {
Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize); Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page,companyId,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear()); IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear());
if(!CollectionUtils.isEmpty(list.getRecords())){ if (!CollectionUtils.isEmpty(list.getRecords())) {
List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords(); List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords();
listTbMemberProjectSubitem.forEach(p->{ listTbMemberProjectSubitem.forEach(p -> {
if(!StringUtils.isBlank(p.getEmail())){ if (!StringUtils.isBlank(p.getEmail())) {
p.setEmail(PasswordUtil.decrypt(p.getEmail())); p.setEmail(PasswordUtil.decrypt(p.getEmail()));
} }
if(!StringUtils.isBlank(p.getMobile())){ if (!StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile())); p.setMobile(PasswordUtil.decrypt(p.getMobile()));
} }
}); });
@@ -154,22 +154,22 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
* 收入合同-查询非企业id的项目 * 收入合同-查询非企业id的项目
*/ */
@RequiresPermissions("memberProject:search") @RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-收入合同-查询非企业id的项目", notes="会员项目表-收入合同-查询非企业id的项目") @ApiOperation(value = "会员项目表-收入合同-查询非企业id的项目", notes = "会员项目表-收入合同-查询非企业id的项目")
@GetMapping(value = "/queryListByNotCompany") @GetMapping(value = "/queryListByNotCompany")
public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) { public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
if(StringUtils.isBlank(companyId)){ if (StringUtils.isBlank(companyId)) {
return Result.error("企业id不能为空！"); return Result.error("企业id不能为空！");
} }
LambdaQueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new LambdaQueryWrapper<>();
queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,companyId); queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId, companyId);
List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem);
List<PayMemberProject> list; List<PayMemberProject> list;
if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ if (!CollectionUtils.isEmpty(listPayMemberProjectSubitem)) {
List<String> listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList()); List<String> listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList());
LambdaQueryWrapper<PayMemberProject> queryPayMemberProject = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMemberProject> queryPayMemberProject = new LambdaQueryWrapper<>();
queryPayMemberProject.notIn(PayMemberProject::getId,listId); queryPayMemberProject.notIn(PayMemberProject::getId, listId);
list = memberProjectService.list(queryPayMemberProject); list = memberProjectService.list(queryPayMemberProject);
}else{ } else {
list = memberProjectService.list(); list = memberProjectService.list();
} }
return Result.OK(list); return Result.OK(list);
@@ -179,7 +179,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
* 列表查询 * 列表查询
*/ */
@RequiresPermissions("memberProject:search") @RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-列表查询", notes="会员项目表-列表查询") @ApiOperation(value = "会员项目表-列表查询", notes = "会员项目表-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<PayMemberProject>> queryList() { public Result<List<PayMemberProject>> queryList() {
List<PayMemberProject> list = memberProjectService.queryList(); List<PayMemberProject> list = memberProjectService.queryList();
@@ -191,7 +191,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
*/ */
@RequiresPermissions("memberProject:add") @RequiresPermissions("memberProject:add")
@AutoLog(value = "会员项目表-添加") @AutoLog(value = "会员项目表-添加")
@ApiOperation(value="会员项目表-添加", notes="会员项目表-添加") @ApiOperation(value = "会员项目表-添加", notes = "会员项目表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody PayMemberProject payMemberProject) { public Result<?> add(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.add(payMemberProject); memberProjectService.add(payMemberProject);
@@ -203,7 +203,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
*/ */
@RequiresPermissions("memberProject:edit") @RequiresPermissions("memberProject:edit")
@AutoLog(value = "会员项目表-编辑") @AutoLog(value = "会员项目表-编辑")
@ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑") @ApiOperation(value = "会员项目表-编辑", notes = "会员项目表-编辑")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody PayMemberProject payMemberProject) { public Result<?> edit(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.editById(payMemberProject); memberProjectService.editById(payMemberProject);
@@ -215,9 +215,9 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
*/ */
@RequiresPermissions("memberProject:delete") @RequiresPermissions("memberProject:delete")
@AutoLog(value = "会员项目表-通过id删除") @AutoLog(value = "会员项目表-通过id删除")
@ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除") @ApiOperation(value = "会员项目表-通过id删除", notes = "会员项目表-通过id删除")
@GetMapping(value = "/delete") @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id") String id) { public Result<?> delete(@RequestParam(name = "id") String id) {
memberProjectService.deleteById(id); memberProjectService.deleteById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -227,9 +227,9 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
*/ */
@RequiresPermissions("memberProject:batchDel") @RequiresPermissions("memberProject:batchDel")
@AutoLog(value = "会员项目表-批量删除") @AutoLog(value = "会员项目表-批量删除")
@ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除") @ApiOperation(value = "会员项目表-批量删除", notes = "会员项目表-批量删除")
@GetMapping(value = "/deleteBatch") @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.memberProjectService.deleteByIds(Arrays.asList(ids.split(","))); this.memberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@@ -238,11 +238,11 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
* 通过id查询 * 通过id查询
*/ */
@RequiresPermissions("memberProject:search") @RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-通过id查询", notes="会员项目表-通过id查询") @ApiOperation(value = "会员项目表-通过id查询", notes = "会员项目表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id") String id) { public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMemberProject payMemberProject = memberProjectService.queryById(id); PayMemberProject payMemberProject = memberProjectService.queryById(id);
if(payMemberProject ==null) { if (payMemberProject == null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
return Result.OK(payMemberProject); return Result.OK(payMemberProject);
@@ -267,7 +267,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
} }
for (PayMemberProject memberProject : pageList) { for (PayMemberProject memberProject : pageList) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); memberProject.setDirectorName(user.getRealname());
} }
return super.exportListXls(pageList, PayMemberProject.class, "会员项目表"); return super.exportListXls(pageList, PayMemberProject.class, "会员项目表");
} }
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+4 -5
View File
@@ -86,10 +86,10 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
PayContactsManagement contactsManagement = contactsManagementService.getById(userId); PayContactsManagement contactsManagement = contactsManagementService.getById(userId);
payMemberProjectSubitem.setCompanyId(contactsManagement.getCompanyId()); payMemberProjectSubitem.setCompanyId(contactsManagement.getCompanyId());
QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap()); QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
if (StringUtils.isNotBlank(payMemberProjectSubitem.getParticularYear())){ if (StringUtils.isNotBlank(payMemberProjectSubitem.getParticularYear())) {
queryWrapper.eq("pmp.particular_year",payMemberProjectSubitem.getParticularYear()); queryWrapper.eq("pmp.particular_year", payMemberProjectSubitem.getParticularYear());
} }
if (StringUtils.isNotBlank(payMemberProjectSubitem.getProjectName())){ if (StringUtils.isNotBlank(payMemberProjectSubitem.getProjectName())) {
queryWrapper.like("pmp.project_name", oConvertUtils.replaceAllPercent(payMemberProjectSubitem.getProjectName().trim())); queryWrapper.like("pmp.project_name", oConvertUtils.replaceAllPercent(payMemberProjectSubitem.getProjectName().trim()));
} }
Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize); Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
@@ -98,7 +98,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
//DirectorName存的是id //DirectorName存的是id
LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName()); LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName());
memberProjectSubitem.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); memberProjectSubitem.setDirectorName(user.getRealname());
} }
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -115,7 +115,6 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
} }
/** /**
* 添加 * 添加
*/ */