ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 流程完善

Browse Source
This commit is contained in:
yjz
2023-12-14 09:09:07 +08:00
parent 7e980e07e0
commit 6722d6c20c
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java
+2 -2
View File
@@ -86,8 +86,8 @@ public class LawsContactManageController extends JeroController<LawsContactManag
@AutoLog(value = "联络人管理-根据部门ids查询")
@ApiOperation(value="联络人管理-根据部门ids查询", notes="联络人管理-根据部门ids查询")
@GetMapping(value = "/queryByDepartIds")
public Result<String> queryByDepartIds(String deptIds) {
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), lawsContactManageService.queryByDepartIds(deptIds));
public Result<List<LawsContactManage>> queryByDepartIds(String deptIds) {
return Result.OK(lawsContactManageService.queryByDepartIds(deptIds));
}
/**
laws-modules/src/main/java/com/jero/modules/laws/system/entity/LawsContactManage.java
+10 -8
View File
@@ -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")
laws-modules/src/main/java/com/jero/modules/laws/system/service/ILawsContactManageService.java
+1 -1
View File
@@ -94,5 +94,5 @@ public interface ILawsContactManageService extends IService<LawsContactManage> {
* @param deptIds
* @return
*/
String queryByDepartIds(String deptIds);
List<LawsContactManage> queryByDepartIds(String deptIds);
}
laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java
+9 -6
View File
@@ -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<LawsContactManageM
}
@Override
public String queryByDepartIds(String deptIds) {
public List<LawsContactManage> queryByDepartIds(String deptIds) {
List<LawsContactManage> lawsContactManageList = new ArrayList<>();
if (StringUtils.isNotBlank(deptIds)){
List<String> departIdList = Arrays.asList(deptIds.split(","));
lawsContactManageList = list(new LambdaQueryWrapper<LawsContactManage>()
.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;
}
}