diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index d5244a469..127853d68 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -162,7 +162,9 @@ public class LawsMonthlyReportWriteEO implements Serializable { /**法规联系人*/ @Excel(name = "法规联系人", width = 15) @ApiModelProperty(value = "法规联系人") - private java.lang.String lawsContact; + private java.lang.String lawsContact;//存id + @TableField(exist = false) + private java.lang.String lawsContactName;//存用户名 /**链接*/ @Excel(name = "链接", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 712e5851f..3236082de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.report.service.impl; import cn.hutool.core.util.ZipUtil; +import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -289,6 +290,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); //法规月报id List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + List userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + List userIds = new ArrayList<>(); + for (String s : userIdList) { + if(StringUtils.isNotBlank(s)){ + if(s.contains(",")){ + userIds.addAll(Arrays.asList(s.split(","))); + }else{ + userIds.add(s); + } + } + } + List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); + List userList = new ArrayList<>(); + for (JSONObject jsonObject : jsonObjects) { + LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); + userList.add(loginUser); + } + //获取章节目录 List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); @@ -311,6 +330,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() @@ -356,6 +377,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); + if(StringUtils.isNotBlank(lawsContact)){ + List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); + StringBuilder sb = new StringBuilder(); + for (String s : lawsContact.split(",")) { + List loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); + if(loginUserList.size() != 0){ + sb.append(loginUserList.get(0).getUsername()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + lawsMonthlyReportWriteEO.setLawsContactName(substring); + } + } + } + @Override public void exportMonthlyReport(HttpServletResponse response, HttpServletRequest request,