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
+6 -6
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);
@@ -232,8 +232,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) { for (PayMeeting meeting : pageList) {
//查询会议负责人 //查询会议负责人
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
+5 -5
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);
@@ -232,8 +232,8 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
for (PayMeeting meeting : pageList) { for (PayMeeting meeting : pageList) {
//查询会议负责人 //查询会议负责人
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
+5 -5
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);
@@ -232,8 +232,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
for (PayMeeting meeting : pageList) { for (PayMeeting meeting : pageList) {
//查询会议负责人 //查询会议负责人
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
+12 -12
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);
} }
@@ -191,17 +191,17 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
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()));
// 查询用户是否已报名此会议 // 查询用户是否已报名此会议
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);
@@ -334,8 +334,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
for (PayMeeting meeting : pageList) { for (PayMeeting meeting : pageList) {
//查询会议负责人 //查询会议负责人
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
+5 -5
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);
@@ -232,8 +232,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) { for (PayMeeting meeting : pageList) {
//查询会议负责人 //查询会议负责人
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
+5 -5
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);
@@ -233,8 +233,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) { for (PayMeeting meeting : pageList) {
//查询会议负责人 //查询会议负责人
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
+514 -511
View File
File diff suppressed because it is too large Load Diff
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+200 -200
View File
@@ -45,216 +45,216 @@ 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
public class PayMemberProjectController extends JeroController<PayMemberProject, IPayMemberProjectService> { public class PayMemberProjectController extends JeroController<PayMemberProject, IPayMemberProjectService> {
@Resource @Resource
private IPayMemberProjectService memberProjectService; private IPayMemberProjectService memberProjectService;
@Resource @Resource
private IPayIncomeContractService payIncomeContractService; private IPayIncomeContractService payIncomeContractService;
@Resource @Resource
private ITbMemberProjectSubitemService tbMemberProjectSubitemService; private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource @Resource
private IPayMemberProjectSubitemService memberProjectSubitemService; private IPayMemberProjectSubitemService memberProjectSubitemService;
@Resource @Resource
private ISysBaseAPI sysBaseAPI; private ISysBaseAPI sysBaseAPI;
/**
* 分页列表查询
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-根据成员单位列表查询", notes="会员项目表-根据成员单位列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(PayMemberProject payMemberProject,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)){
payMemberProject.setDirectorId(sysUser.getId());
}
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
for (PayMemberProject memberProject : memberProjectPage.getRecords()) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return Result.OK(memberProjectPage);
}
/**
* @Description 收入合同列表分页查询
* @Author lqt
* @Date 2021/9/17
* @Param companyId 企业id
* @Param contractId 合同id
* @Param projectType 会员类型 4：会员项目，5：标协会员项目
* @Param memberName 会员名称
* @Return
* @Exception
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-收入合同列表分页查询", notes="会员项目表-收入合同列表分页查询")
@GetMapping(value = "/queryListByCompany")
public Result<?> queryListByCompany(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "companyId") String companyId,
@RequestParam(name = "contractId") String contractId,
@RequestParam(name = "projectType") String projectType,
@RequestParam(name = "projectName",required = false) String projectName,
@RequestParam(name = "memberName", required = false) String memberName) {
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
}
PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
if(Objects.isNull(payIncomeContract)){
return Result.error("合同不存在！");
}
// 会员
if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE4)){
Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
projectName = oConvertUtils.replaceAllPercent(projectName);
IPage<PayMemberProject> list = memberProjectService.queryListByCompany(page,companyId,projectName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear());
return Result.OK(list);
}
// 标协会员
if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE5)){
Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page,companyId,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear());
if(!CollectionUtils.isEmpty(list.getRecords())){
List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords();
listTbMemberProjectSubitem.forEach(p->{
if(!StringUtils.isBlank(p.getEmail())){
p.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
if(!StringUtils.isBlank(p.getMobile())){
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
list.setRecords(listTbMemberProjectSubitem);
}
return Result.OK(list);
}
return Result.OK(null);
}
/**
* 收入合同-查询非企业id的项目
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-收入合同-查询非企业id的项目", notes="会员项目表-收入合同-查询非企业id的项目")
@GetMapping(value = "/queryListByNotCompany")
public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
}
LambdaQueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new LambdaQueryWrapper<>();
queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,companyId);
List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem);
List<PayMemberProject> list;
if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){
List<String> listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList());
LambdaQueryWrapper<PayMemberProject> queryPayMemberProject = new LambdaQueryWrapper<>();
queryPayMemberProject.notIn(PayMemberProject::getId,listId);
list = memberProjectService.list(queryPayMemberProject);
}else{
list = memberProjectService.list();
}
return Result.OK(list);
}
/** /**
* 列表查询 * 分页列表查询
*/ */
@RequiresPermissions("memberProject:search") @RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-列表查询", notes="会员项目表-列表查询") @ApiOperation(value = "会员项目表-根据成员单位列表查询", notes = "会员项目表-根据成员单位列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/page")
public Result<List<PayMemberProject>> queryList() { public Result<?> queryPageList(PayMemberProject payMemberProject,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) {
payMemberProject.setDirectorId(sysUser.getId());
}
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
for (PayMemberProject memberProject : memberProjectPage.getRecords()) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
memberProject.setDirectorName(user.getRealname());
}
return Result.OK(memberProjectPage);
}
/**
* @Description 收入合同列表分页查询
* @Author lqt
* @Date 2021/9/17
* @Param companyId 企业id
* @Param contractId 合同id
* @Param projectType 会员类型 4：会员项目，5：标协会员项目
* @Param memberName 会员名称
* @Return
* @Exception
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value = "会员项目表-收入合同列表分页查询", notes = "会员项目表-收入合同列表分页查询")
@GetMapping(value = "/queryListByCompany")
public Result<?> queryListByCompany(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "companyId") String companyId,
@RequestParam(name = "contractId") String contractId,
@RequestParam(name = "projectType") String projectType,
@RequestParam(name = "projectName", required = false) String projectName,
@RequestParam(name = "memberName", required = false) String memberName) {
if (StringUtils.isBlank(companyId)) {
return Result.error("企业id不能为空！");
}
PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
if (Objects.isNull(payIncomeContract)) {
return Result.error("合同不存在！");
}
// 会员
if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE4)) {
Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
projectName = oConvertUtils.replaceAllPercent(projectName);
IPage<PayMemberProject> list = memberProjectService.queryListByCompany(page, companyId, projectName, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear());
return Result.OK(list);
}
// 标协会员
if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE5)) {
Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear());
if (!CollectionUtils.isEmpty(list.getRecords())) {
List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords();
listTbMemberProjectSubitem.forEach(p -> {
if (!StringUtils.isBlank(p.getEmail())) {
p.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
if (!StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
list.setRecords(listTbMemberProjectSubitem);
}
return Result.OK(list);
}
return Result.OK(null);
}
/**
* 收入合同-查询非企业id的项目
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value = "会员项目表-收入合同-查询非企业id的项目", notes = "会员项目表-收入合同-查询非企业id的项目")
@GetMapping(value = "/queryListByNotCompany")
public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
if (StringUtils.isBlank(companyId)) {
return Result.error("企业id不能为空！");
}
LambdaQueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new LambdaQueryWrapper<>();
queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId, companyId);
List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem);
List<PayMemberProject> list;
if (!CollectionUtils.isEmpty(listPayMemberProjectSubitem)) {
List<String> listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList());
LambdaQueryWrapper<PayMemberProject> queryPayMemberProject = new LambdaQueryWrapper<>();
queryPayMemberProject.notIn(PayMemberProject::getId, listId);
list = memberProjectService.list(queryPayMemberProject);
} else {
list = memberProjectService.list();
}
return Result.OK(list);
}
/**
* 列表查询
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value = "会员项目表-列表查询", notes = "会员项目表-列表查询")
@GetMapping(value = "/list")
public Result<List<PayMemberProject>> queryList() {
List<PayMemberProject> list = memberProjectService.queryList(); List<PayMemberProject> list = memberProjectService.queryList();
return Result.OK(list); return Result.OK(list);
} }
/**
* 添加
*/
@RequiresPermissions("memberProject:add")
@AutoLog(value = "会员项目表-添加")
@ApiOperation(value="会员项目表-添加", notes="会员项目表-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.add(payMemberProject);
return Result.OK("添加成功！");
}
/**
* 编辑
*/
@RequiresPermissions("memberProject:edit")
@AutoLog(value = "会员项目表-编辑")
@ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.editById(payMemberProject);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*/
@RequiresPermissions("memberProject:delete")
@AutoLog(value = "会员项目表-通过id删除")
@ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id") String id) {
memberProjectService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*/
@RequiresPermissions("memberProject:batchDel")
@AutoLog(value = "会员项目表-批量删除")
@ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
this.memberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value="会员项目表-通过id查询", notes="会员项目表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id") String id) {
PayMemberProject payMemberProject = memberProjectService.queryById(id);
if(payMemberProject ==null) {
return Result.error("未找到对应数据");
}
return Result.OK(payMemberProject);
}
/** /**
* 导出excel * 添加
*/ */
@RequiresPermissions("memberProject:export") @RequiresPermissions("memberProject:add")
@AutoLog(value = "会员项目表-添加")
@ApiOperation(value = "会员项目表-添加", notes = "会员项目表-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.add(payMemberProject);
return Result.OK("添加成功！");
}
/**
* 编辑
*/
@RequiresPermissions("memberProject:edit")
@AutoLog(value = "会员项目表-编辑")
@ApiOperation(value = "会员项目表-编辑", notes = "会员项目表-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.editById(payMemberProject);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*/
@RequiresPermissions("memberProject:delete")
@AutoLog(value = "会员项目表-通过id删除")
@ApiOperation(value = "会员项目表-通过id删除", notes = "会员项目表-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
memberProjectService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*/
@RequiresPermissions("memberProject:batchDel")
@AutoLog(value = "会员项目表-批量删除")
@ApiOperation(value = "会员项目表-批量删除", notes = "会员项目表-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.memberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*/
@RequiresPermissions("memberProject:search")
@ApiOperation(value = "会员项目表-通过id查询", notes = "会员项目表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMemberProject payMemberProject = memberProjectService.queryById(id);
if (payMemberProject == null) {
return Result.error("未找到对应数据");
}
return Result.OK(payMemberProject);
}
/**
* 导出excel
*/
@RequiresPermissions("memberProject:export")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) { public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) {
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap()); QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap());
List<PayMemberProject> pageList = memberProjectService.list(queryWrapper); List<PayMemberProject> pageList = memberProjectService.list(queryWrapper);
// 过滤选中数据 // 过滤选中数据
String selections = request.getParameter("selections"); String selections = request.getParameter("selections");
@@ -265,16 +265,16 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
if (pageList.isEmpty()) { if (pageList.isEmpty()) {
throw new JeroBootException("没有数据"); throw new JeroBootException("没有数据");
} }
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, "会员项目表");
} }
/** /**
* 通过excel导入数据 * 通过excel导入数据
*/ */
/*@RequestMapping(value = "/importExcel", method = RequestMethod.POST) /*@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayMemberProject.class); return super.importExcel(request, response, PayMemberProject.class);
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+8 -9
View File
@@ -78,18 +78,18 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@ApiOperation(value = "企业端 会员项目成员表-分页列表查询", notes = "企业联系人相关的资料网员项目") @ApiOperation(value = "企业端 会员项目成员表-分页列表查询", notes = "企业联系人相关的资料网员项目")
@GetMapping(value = "/pageCompany") @GetMapping(value = "/pageCompany")
public Result<IPage<PayMemberProjectSubitem>> queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem, public Result<IPage<PayMemberProjectSubitem>> queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem,
@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 loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = loginUser.getId(); String userId = loginUser.getId();
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);
@@ -97,8 +97,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) { for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) {
//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
} }
/** /**
* 添加 * 添加
*/ */