|
@@ -1,6 +1,7 @@
|
|
|
package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport;
|
|
package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport;
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
+import cn.hutool.core.util.ObjUtil;
|
|
|
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
|
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
@@ -89,8 +90,12 @@ public class IotRyImproveDailyReportController {
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
|
|
@PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:query')")
|
|
@PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:query')")
|
|
|
public CommonResult<IotRyImproveDailyReportRespVO> getIotRyImproveDailyReport(@RequestParam("id") Long id) {
|
|
public CommonResult<IotRyImproveDailyReportRespVO> getIotRyImproveDailyReport(@RequestParam("id") Long id) {
|
|
|
|
|
+ IotRyImproveDailyReportRespVO result = new IotRyImproveDailyReportRespVO();
|
|
|
IotRyImproveDailyReportDO iotRyImproveDailyReport = iotRyImproveDailyReportService.getIotRyImproveDailyReport(id);
|
|
IotRyImproveDailyReportDO iotRyImproveDailyReport = iotRyImproveDailyReportService.getIotRyImproveDailyReport(id);
|
|
|
- IotRyImproveDailyReportRespVO result = BeanUtils.toBean(iotRyImproveDailyReport, IotRyImproveDailyReportRespVO.class);
|
|
|
|
|
|
|
+ if (ObjUtil.isEmpty(iotRyImproveDailyReport)) {
|
|
|
|
|
+ return success(result);
|
|
|
|
|
+ }
|
|
|
|
|
+ result = BeanUtils.toBean(iotRyImproveDailyReport, IotRyImproveDailyReportRespVO.class);
|
|
|
// 设置 设备整改日报明细
|
|
// 设置 设备整改日报明细
|
|
|
IotRyImproveDailyReportDetailPageReqVO pageReqVO = new IotRyImproveDailyReportDetailPageReqVO();
|
|
IotRyImproveDailyReportDetailPageReqVO pageReqVO = new IotRyImproveDailyReportDetailPageReqVO();
|
|
|
pageReqVO.setReportId(result.getId());
|
|
pageReqVO.setReportId(result.getId());
|