7ae6caba sonin

培训记录补录 补充所属厂

1 个父辈 36d8a38e
......@@ -85,6 +85,7 @@ public class AjhEduTrainingRecordController {
// 翻译
Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
Map<String, String> eduTraLxDictMap = businessService.dictMap("edu_tra_lx", null);
Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
// 封装结果
IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
mapIPage.setTotal(pageList.getTotal());
......@@ -102,6 +103,7 @@ public class AjhEduTrainingRecordController {
}
map.put("joinUser_dictText", String.join(",", joinUserNameList));
map.put("eduTraLx_dictText", eduTraLxDictMap.get(item.getEduTraLx()));
map.put("departName", sysDepartDictMap.get(item.getDepartId()));
return map;
}).collect(Collectors.toList()));
result.setSuccess(true);
......
......@@ -116,4 +116,6 @@ public class AjhEduTrainingRecord {
@Excel(name = "删除状态(0正常;1已删除)", width = 15)
@ApiModelProperty(value = "删除状态(0正常;1已删除)")
private String delFlag;
private String departId;
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!