培训记录补录 补充所属厂
正在显示
2 个修改的文件
包含
4 行增加
和
0 行删除
... | @@ -85,6 +85,7 @@ public class AjhEduTrainingRecordController { | ... | @@ -85,6 +85,7 @@ public class AjhEduTrainingRecordController { |
85 | // 翻译 | 85 | // 翻译 |
86 | Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null); | 86 | Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null); |
87 | Map<String, String> eduTraLxDictMap = businessService.dictMap("edu_tra_lx", null); | 87 | Map<String, String> eduTraLxDictMap = businessService.dictMap("edu_tra_lx", null); |
88 | Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null); | ||
88 | // 封装结果 | 89 | // 封装结果 |
89 | IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize); | 90 | IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize); |
90 | mapIPage.setTotal(pageList.getTotal()); | 91 | mapIPage.setTotal(pageList.getTotal()); |
... | @@ -102,6 +103,7 @@ public class AjhEduTrainingRecordController { | ... | @@ -102,6 +103,7 @@ public class AjhEduTrainingRecordController { |
102 | } | 103 | } |
103 | map.put("joinUser_dictText", String.join(",", joinUserNameList)); | 104 | map.put("joinUser_dictText", String.join(",", joinUserNameList)); |
104 | map.put("eduTraLx_dictText", eduTraLxDictMap.get(item.getEduTraLx())); | 105 | map.put("eduTraLx_dictText", eduTraLxDictMap.get(item.getEduTraLx())); |
106 | map.put("departName", sysDepartDictMap.get(item.getDepartId())); | ||
105 | return map; | 107 | return map; |
106 | }).collect(Collectors.toList())); | 108 | }).collect(Collectors.toList())); |
107 | result.setSuccess(true); | 109 | result.setSuccess(true); | ... | ... |
... | @@ -116,4 +116,6 @@ public class AjhEduTrainingRecord { | ... | @@ -116,4 +116,6 @@ public class AjhEduTrainingRecord { |
116 | @Excel(name = "删除状态(0正常;1已删除)", width = 15) | 116 | @Excel(name = "删除状态(0正常;1已删除)", width = 15) |
117 | @ApiModelProperty(value = "删除状态(0正常;1已删除)") | 117 | @ApiModelProperty(value = "删除状态(0正常;1已删除)") |
118 | private String delFlag; | 118 | private String delFlag; |
119 | |||
120 | private String departId; | ||
119 | } | 121 | } | ... | ... |
-
请 注册 或 登录 后发表评论