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

update 法规合规评估流程 查询评估列表

Browse Source
This commit is contained in:
lijiarao
2024-01-23 09:42:33 +08:00
parent ebe8a72328
commit fccfe26341
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class ProcessProjectStandardTermUser {
/** /**
* 设计工程师 * 设计工程师
*/ */
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@TableField(value = "design_engineer") @TableField(value = "design_engineer")
@ApiModelProperty(value="设计工程师") @ApiModelProperty(value="设计工程师")
private String designEngineer; private String designEngineer;
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
-12
View File
@@ -888,18 +888,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
public IPage<ProcessProjectStandardTermUser> getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) { public IPage<ProcessProjectStandardTermUser> getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) {
Page<ProcessProjectStandardTermUser> page = new Page<>(pageNo, pageSize); Page<ProcessProjectStandardTermUser> page = new Page<>(pageNo, pageSize);
Page<ProcessProjectStandardTermUser> pageList = termUserMapper.selectPageByUser(page, termUser); Page<ProcessProjectStandardTermUser> pageList = termUserMapper.selectPageByUser(page, termUser);
//获取所有用户信息
List<LoginUser> userList = sysBaseAPI.getAllUser();
Map<String, String> userNameMap = new HashMap<>();
for (LoginUser loginUser : userList) {
userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo());
}
for (ProcessProjectStandardTermUser record : pageList.getRecords()) {
String moduleOwner = record.getModuleOwner();
record.setModuleOwner(userNameMap.get(moduleOwner));
String designEngineer = record.getDesignEngineer();
record.setDesignEngineer(userNameMap.get(designEngineer));
}
return pageList; return pageList;
} }