diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java index f66d84eb..6af3a6dc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java @@ -53,6 +53,7 @@ public class ProcessEsDeclare extends BaseEntity { private java.lang.String declareUser; /**宣贯人 翻译*/ @ApiModelProperty(value = "宣贯人 翻译") + @TableField(exist = false) private java.lang.String declareUserDictText; /**主题*/ @Excel(name = "主题", width = 15) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java b/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java index 55975862..07e5da6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java @@ -86,8 +86,8 @@ public class LawsContactManageController extends JeroController queryByDepartIds(String deptIds) { - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), lawsContactManageService.queryByDepartIds(deptIds)); + public Result> queryByDepartIds(String deptIds) { + return Result.OK(lawsContactManageService.queryByDepartIds(deptIds)); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java b/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java index dcc96409..c52fdc92 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java @@ -1,22 +1,20 @@ package com.jero.modules.laws.system.entity; -import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -80,6 +78,10 @@ public class LawsContactManage implements Serializable { @ApiModelProperty(value = "联络人id") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private java.lang.String contactId; + /**联络人 翻译*/ + @ApiModelProperty(value = "联络人 翻译") + @TableField(exist = false) + private java.lang.String contactIdDictText; /**部门联络人主管级领导id*/ @Excel(name = "部门联络人主管级领导id", width = 15) @ApiModelProperty(value = "部门联络人主管级领导id") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/service/ILawsContactManageService.java b/laws-modules/src/main/java/com/jero/modules/laws/system/service/ILawsContactManageService.java index c8d7daf6..bba184e2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/service/ILawsContactManageService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/service/ILawsContactManageService.java @@ -94,5 +94,5 @@ public interface ILawsContactManageService extends IService { * @param deptIds * @return */ - String queryByDepartIds(String deptIds); + List queryByDepartIds(String deptIds); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java index cd3ad060..a39c3ba0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.laws.system.entity.LawsContactManage; @@ -20,8 +19,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; /** @@ -168,14 +169,16 @@ public class LawsContactManageServiceImpl extends ServiceImpl queryByDepartIds(String deptIds) { List lawsContactManageList = new ArrayList<>(); if (StringUtils.isNotBlank(deptIds)){ List departIdList = Arrays.asList(deptIds.split(",")); lawsContactManageList = list(new LambdaQueryWrapper() .in(LawsContactManage::getDepartId, departIdList)); + for (LawsContactManage lawsContactManage : lawsContactManageList) { + lawsContactManage.setContactIdDictText(sysUserService.dictByIdsOrUserNames(lawsContactManage.getContactId(), "")); + } } - String contactIds = lawsContactManageList.stream().map(LawsContactManage::getContactId).collect(Collectors.joining(",")); - return sysUserService.dictByIdsOrUserNames(contactIds, ""); + return lawsContactManageList; } }