From 9ff33fad0adb40b446b9d1894a13f5b6ceeeb860 Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 28 Sep 2023 15:49:21 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=97=AE=E7=AD=94=E5=BA=93-=E5=9B=9E?= =?UTF-8?q?=E7=AD=94=E4=BA=BA=E9=83=A8=E9=97=A8=E3=80=81=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E3=80=81=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsProblemLibraryController.java | 2 ++ .../library/entity/LawsAnswerLibrary.java | 20 +++++++++--- .../impl/LawsProblemLibraryServiceImpl.java | 32 +++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java b/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java index 6886478d..2d601bf7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java @@ -6,6 +6,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.Translation; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.library.entity.LawsAnswerLibrary; @@ -96,6 +97,7 @@ public class LawsProblemLibraryController extends JeroController queryById(@RequestParam(name="id") String id) { LawsProblemLibrary lawsProblemLibrary = lawsProblemLibraryService.queryById(id); return Result.OK(lawsProblemLibrary); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java index 45f9b7d1..8fac30ee 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; 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 lombok.Data; @@ -38,14 +39,13 @@ public class LawsAnswerLibrary implements Serializable { @ApiModelProperty(value = "主键ID") private java.lang.String id; /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private java.util.Date createTime; /**所属部门*/ @Excel(name = "所属部门", width = 15) @ApiModelProperty(value = "所属部门") - @Dict(dictTable = "sys_depart", dicCode = "org_code", dicText = "depart_name") private java.lang.String orgCode; /**问题id*/ @Excel(name = "问题id", width = 15) @@ -62,6 +62,18 @@ public class LawsAnswerLibrary implements Serializable { /**回答人id*/ @Excel(name = "回答人id", width = 15) @ApiModelProperty(value = "回答人id") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "name_work_no") private java.lang.String userId; + + /**回答人头像*/ + @ApiModelProperty(value = "回答人头像") + @TableField(exist = false) + private java.lang.String avatar; + /**回答人名称*/ + @ApiModelProperty(value = "回答人名称") + @TableField(exist = false) + private java.lang.String name; + /**回答人部门*/ + @ApiModelProperty(value = "回答人部门") + @TableField(exist = false) + private java.lang.String departName; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java index 05d374a6..259a1758 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java @@ -14,6 +14,11 @@ import com.jero.modules.laws.library.entity.LawsProblemLibrary; import com.jero.modules.laws.library.mapper.LawsProblemLibraryMapper; import com.jero.modules.laws.library.service.ILawsAnswerLibraryService; import com.jero.modules.laws.library.service.ILawsProblemLibraryService; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +28,7 @@ import com.jero.common.exception.JeroBootException; import java.util.List; import java.util.Date; import java.util.Objects; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; @@ -45,6 +51,10 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl queryPage(LawsProblemLibrary lawsProblemLibrary, Integer pageNo, Integer pageSize, @@ -130,6 +140,28 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl answerList = lawsAnswerLibraryService.list(queryWrapper); + if (CollectionUtils.isNotEmpty(answerList)) { + List userIdList = answerList.stream() + .map(LawsAnswerLibrary::getUserId).collect(Collectors.toList()); + List orgCodeList = answerList.stream() + .map(LawsAnswerLibrary::getOrgCode).collect(Collectors.toList()); + LambdaQueryWrapper userQueryWrapper = new LambdaQueryWrapper<>(); + userQueryWrapper.in(SysUser::getId, userIdList); + List userList = sysUserService.list(userQueryWrapper); + LambdaQueryWrapper departQueryWrapper = new LambdaQueryWrapper<>(); + departQueryWrapper.in(SysDepart::getOrgCode, orgCodeList); + List departList = sysDepartService.list(departQueryWrapper); + answerList.forEach(answer -> { + SysUser sysUser = userList.stream().filter(user -> answer.getUserId() + .equals(user.getId())).collect(Collectors.toList()).get(0); + SysDepart sysDepart = departList.stream().filter(depart -> answer.getOrgCode() + .equals(depart.getOrgCode())).collect(Collectors.toList()).get(0); + answer.setAvatar(sysUser.getAvatar()); + answer.setName(sysUser.getNameWorkNo()); + answer.setDepartName(sysDepart.getDepartName()); + }); + } + lawsProblemLibrary.setAnswerList(answerList); lawsProblemLibrary.setAnswerCount(answerList.size());