From 48ff242e0cde2bedd370f13d748a1a3c8cbf0f15 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 18 Oct 2021 11:53:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2040864=20=E8=B5=84=E6=96=99=E7=BD=91?= =?UTF-8?q?=E5=91=98--=E5=88=97=E8=A1=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E4=B8=8D=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayMemberProjectController.java | 33 +++++++++++++++++-- .../PayMemberProjectSubitemController.java | 7 ++++ .../jero/member/entity/PayMemberProject.java | 2 +- .../entity/PayMemberProjectSubitem.java | 6 ++++ .../xml/PayMemberProjectSubitemMapper.xml | 3 +- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index 6ca71186..e94a5d0d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -11,8 +11,12 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; +import com.jero.common.util.oConvertUtils; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; import com.jero.member.entity.PayMemberProject; @@ -52,12 +56,14 @@ import com.jero.common.aspect.annotation.AutoLog; public class PayMemberProjectController extends JeroController { @Resource private IPayMemberProjectService memberProjectService; - @Autowired + @Resource private IPayIncomeContractService payIncomeContractService; @Resource private ITbMemberProjectSubitemService tbMemberProjectSubitemService; @Resource private IPayMemberProjectSubitemService memberProjectSubitemService; + @Resource + private ISysBaseAPI sysBaseAPI; /** @@ -73,6 +79,12 @@ public class PayMemberProjectController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); IPage memberProjectPage = memberProjectService.getPage(page, queryWrapper); + for (PayMemberProject memberProject : memberProjectPage.getRecords()) { + LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); + List departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + memberProject.setDirectorName(user.getRealname() + "(" + departName + ")"); + } return Result.OK(memberProjectPage); } @@ -236,7 +248,24 @@ public class PayMemberProjectController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap()); + List pageList = memberProjectService.list(queryWrapper); + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } + if (pageList.isEmpty()) { + throw new JeroBootException("没有数据"); + } + for (PayMemberProject memberProject : pageList) { + LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); + List departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + memberProject.setDirectorName(user.getRealname() + "(" + departName + ")"); + } + return super.exportListXls(pageList, PayMemberProject.class, "会员项目表"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 307a91eb..bc5127bf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -90,6 +90,13 @@ public class PayMemberProjectSubitemController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = memberProjectSubitemService.queryPageListCompany(page, queryWrapper); + for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) { + //DirectorName存的是id + LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName()); + List departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); + String departName = departNamesByUsername.get(0); + memberProjectSubitem.setDirectorName(user.getRealname() + "(" + departName + ")"); + } return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java index dc67adfd..80eb378c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java @@ -93,7 +93,6 @@ public class PayMemberProject implements Serializable { /** * 负责人id */ - @Excel(name = "负责人名称", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id") @ApiModelProperty(value = "负责人id") @NotBlank(message = "负责人不能为空") private String directorId; @@ -101,6 +100,7 @@ public class PayMemberProject implements Serializable { /** * 负责人名称 */ + @Excel(name = "负责人名称", width = 15) @ApiModelProperty(value = "负责人名称") private String directorName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 952604bf..49d8ae02 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -265,4 +265,10 @@ public class PayMemberProjectSubitem implements Serializable { @TableField(exist = false) private String particularYear; + /** + * 负责人名称 + */ + @TableField(exist = false) + private String directorName; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index edc3febd..40fbac66 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -31,10 +31,11 @@ +