pms 瑞鹰日报 详情 返回 项目任务信息

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/IotRyDailyReportController.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojectinfo.vo.IotProjectInfoPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo.*;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectinfo.IotProjectInfoDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
@@ -97,7 +98,22 @@ public class IotRyDailyReportController {
     @PreAuthorize("@ss.hasPermission('pms:iot-ry-daily-report:query')")
     public CommonResult<IotRyDailyReportRespVO> getIotRyDailyReport(@RequestParam("id") Long id) {
         IotRyDailyReportDO iotRyDailyReport = iotRyDailyReportService.getIotRyDailyReport(id);
-        return success(BeanUtils.toBean(iotRyDailyReport, IotRyDailyReportRespVO.class));
+        if (ObjUtil.isEmpty(iotRyDailyReport)) {
+            return success(null);
+        }
+        IotRyDailyReportRespVO result = BeanUtils.toBean(iotRyDailyReport, IotRyDailyReportRespVO.class);
+        // 查询日报对应的 项目 任务
+        Long projectId = iotRyDailyReport.getProjectId();
+        Long taskId = iotRyDailyReport.getTaskId();
+        if (ObjUtil.isNotEmpty(projectId)) {
+            IotProjectInfoDO project = iotProjectInfoService.getIotProjectInfo(projectId);
+            result.setContractName(project.getContractName());
+        }
+        if (ObjUtil.isNotEmpty(taskId)) {
+            IotProjectTaskDO task = iotProjectTaskService.getIotProjectTask(taskId);
+            result.setTaskName(task.getWellName());
+        }
+        return success(result);
     }
 
     @GetMapping("/ryDailyReportStatistics")