|
|
@@ -306,6 +306,19 @@ public class IotRdDailyReportController {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ // 临时新建的任务 填报人
|
|
|
+ String creatorIdStr = dailyReport.getCreator();
|
|
|
+ if (StrUtil.isNotBlank(creatorIdStr)) {
|
|
|
+ Long creatorId = Long.valueOf(creatorIdStr);
|
|
|
+ Set<Long> submitterIds = new HashSet<>();
|
|
|
+ submitterIds.add(creatorId);
|
|
|
+ List<AdminUserRespDTO> users = adminUserApi.getUserList(submitterIds);
|
|
|
+ String userNames = users.stream()
|
|
|
+ .map(AdminUserRespDTO::getNickname)
|
|
|
+ .collect(Collectors.joining(","));
|
|
|
+ dailyReportVO.setSubmitterNames(userNames);
|
|
|
+ }
|
|
|
+
|
|
|
// 查询日报对应的任务信息
|
|
|
if (ObjUtil.isNotEmpty(dailyReport.getTaskId())) {
|
|
|
IotProjectTaskDO task = iotProjectTaskService.getIotProjectTask(dailyReport.getTaskId());
|