From 4fca59ec13088552b93f51a64fe20769e567ea72 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Oct 2021 16:09:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2040445=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E4=BC=9A=E8=AE=AE=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E5=88=97=E8=A1=A8-=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E6=88=90=E4=BA=86=E7=94=A8=E6=88=B7=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=9B=9E=E6=98=BE=E4=B8=BA:=E5=A7=93?= =?UTF-8?q?=E5=90=8D+=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingController.java | 17 +++++++++----- .../controller/InternalMeetingController.java | 16 +++++++++----- .../controller/OtherMeetingController.java | 16 +++++++++----- .../controller/PayMeetingController.java | 22 ++++++++++++------- .../StandardsMeetingController.java | 16 +++++++++----- .../WorkGroupMeetingController.java | 17 +++++++++----- .../com/jero/meeting/entity/PayMeeting.java | 4 +++- 7 files changed, 73 insertions(+), 35 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index 2421d126..47042856 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -115,7 +115,9 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -140,7 +142,7 @@ public class CommitteeMeetingController extends JeroController add(@RequestBody PayMeetingVO payMeetingVO) { String meetingType = payMeetingVO.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING)){ + if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING)) { throw new RuntimeException(); } ValidUtil.validate(payMeetingVO); @@ -166,13 +168,12 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -264,7 +267,9 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index 671a6619..c0ad4cd0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -115,7 +115,9 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -140,7 +142,7 @@ public class InternalMeetingController extends JeroController add(@RequestBody PayMeetingVO payMeetingVO) { String meetingType = payMeetingVO.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.INTERNATIONAL_MEETING)){ + if (!Objects.equals(meetingType, MeetingCommon.INTERNATIONAL_MEETING)) { throw new RuntimeException(); } ValidUtil.validate(payMeetingVO); @@ -151,7 +153,7 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -263,7 +267,9 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index 79f3b8e2..11b41b6a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -115,7 +115,9 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -140,7 +142,7 @@ public class OtherMeetingController extends JeroController add(@RequestBody PayMeetingVO payMeetingVO) { String meetingType = payMeetingVO.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING)){ + if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING)) { throw new RuntimeException(); } ValidUtil.validate(payMeetingVO); @@ -151,7 +153,7 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -263,7 +267,9 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index ba7afc5c..ca56bb8b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -90,10 +90,10 @@ public class PayMeetingController extends JeroController queryPageList(PayMeeting payMeeting, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(PayMeeting payMeeting, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -116,7 +116,7 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); } @@ -286,7 +288,9 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -336,7 +340,9 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 1fd609fc..dee6b600 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -115,7 +115,9 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -140,7 +142,7 @@ public class StandardsMeetingController extends JeroController add(@RequestBody PayMeetingVO payMeetingVO) { String meetingType = payMeetingVO.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.STANDARD_MEETING)){ + if (!Objects.equals(meetingType, MeetingCommon.STANDARD_MEETING)) { throw new RuntimeException(); } ValidUtil.validate(payMeetingVO); @@ -151,7 +153,7 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -263,7 +267,9 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index 4af56808..6749c6c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -115,7 +115,9 @@ public class WorkGroupMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -140,17 +142,18 @@ public class WorkGroupMeetingController extends JeroController add(@RequestBody PayMeetingVO payMeetingVO) { String meetingType = payMeetingVO.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.WORKING_GROUP_MEETING)){ + if (!Objects.equals(meetingType, MeetingCommon.WORKING_GROUP_MEETING)) { throw new RuntimeException(); } ValidUtil.validate(payMeetingVO); payMeetingService.add(payMeetingVO); return Result.OK("添加成功！"); } + private void extracted(String id) { PayMeeting payMeeting = payMeetingService.getById(id); Integer meetingType = payMeeting.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.WORKING_GROUP_MEETING_INT)){ + if (!Objects.equals(meetingType, MeetingCommon.WORKING_GROUP_MEETING_INT)) { throw new RuntimeException(); } } @@ -211,7 +214,9 @@ public class WorkGroupMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -262,7 +267,9 @@ public class WorkGroupMeetingController extends JeroController departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 7e2ac5b2..4f735081 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -10,9 +10,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.util.PasswordUtil; import com.jero.meeting.valid.group.StandardMeeting; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; @@ -200,12 +202,12 @@ public class PayMeeting implements Serializable { private BigDecimal meetingCostsVip; /**会议负责人id*/ - @Excel(name = "会议负责人", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id") @ApiModelProperty(value = "会议负责人id") private String directorId; /**会议负责人*/ @ApiModelProperty(value = "会议负责人") + @Excel(name = "会议负责人") private String directorName; /**会议负责人手机号*/