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

fix bug 40445 工作组项目-会议维护-列表-负责人回显成了用户名，建议回显为:姓名+部门

Browse Source
This commit is contained in:
lijiarao
2021-10-14 16:09:44 +08:00
parent 5dd92618ae
commit 4fca59ec13
7 changed files with 73 additions and 35 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
+11 -6
View File
@@ -115,7 +115,9 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -140,7 +142,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@PostMapping(value = "/add")
public Result<?> 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<PayMeeting, IPayM
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING_INT)){
if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING_INT)) {
throw new RuntimeException();
}
}
/**
*
* 通过id删除
*/
@RequiresPermissions("committeeMeeting:delete")
@@ -213,7 +214,9 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -264,7 +267,9 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+11 -5
View File
@@ -115,7 +115,9 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -140,7 +142,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@PostMapping(value = "/add")
public Result<?> 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<PayMeeting, IPayMe
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.INTERNATIONAL_MEETING_INT)){
if (!Objects.equals(meetingType, MeetingCommon.INTERNATIONAL_MEETING_INT)) {
throw new RuntimeException();
}
}
@@ -212,7 +214,9 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -263,7 +267,9 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+11 -5
View File
@@ -115,7 +115,9 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -140,7 +142,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@PostMapping(value = "/add")
public Result<?> 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<PayMeeting, IPayMeeti
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING_INT)){
if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING_INT)) {
throw new RuntimeException();
}
}
@@ -212,7 +214,9 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -263,7 +267,9 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+14 -8
View File
@@ -90,10 +90,10 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
@RequiresPermissions("meeting:search")
@ApiOperation(value = "会议管理-分页列表查询", notes = "会议管理-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Result<IPage<PayMeeting>> queryPageList(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> 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<PayMeeting, IPayMeeting
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -206,7 +206,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> 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<PayMeeting, IPayMeeting
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -336,7 +340,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+11 -5
View File
@@ -115,7 +115,9 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -140,7 +142,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@PostMapping(value = "/add")
public Result<?> 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<PayMeeting, IPayM
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.STANDARD_MEETING_INT)){
if (!Objects.equals(meetingType, MeetingCommon.STANDARD_MEETING_INT)) {
throw new RuntimeException();
}
}
@@ -212,7 +214,9 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -263,7 +267,9 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+12 -5
View File
@@ -115,7 +115,9 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
@@ -140,17 +142,18 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@PostMapping(value = "/add")
public Result<?> 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<PayMeeting, IPayM
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
@@ -262,7 +267,9 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+3 -1
View File
@@ -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;
/**会议负责人手机号*/