计量器具台账添加部门名称

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureBookController.java

@@ -12,6 +12,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureBo
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure.IotMeasureBookMapper;
 import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureBookService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
@@ -53,6 +55,8 @@ public class IotMeasureBookController {
     private DeptService deptService;
     @Autowired
     private DictDataService dictDataService;
+    @Autowired
+    private DeptApi deptApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建计量器具台账")
@@ -109,7 +113,18 @@ public class IotMeasureBookController {
     @PreAuthorize("@ss.hasPermission('rq:iot-measure-book:query')")
     public CommonResult<PageResult<IotMeasureBookRespVO>> getIotMeasureBookPage(@Valid IotMeasureBookPageReqVO pageReqVO) {
         PageResult<IotMeasureBookDO> pageResult = iotMeasureBookService.getIotMeasureBookPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotMeasureBookRespVO.class));
+        List<IotMeasureBookRespVO> collect = pageResult.getList().stream().map(e -> {
+            IotMeasureBookRespVO iotMeasureBookRespVO = new IotMeasureBookRespVO();
+            BeanUtils.copyProperties(e, iotMeasureBookRespVO);
+            if (Objects.nonNull(iotMeasureBookRespVO.getDeptId())) {
+                DeptRespDTO dept = deptApi.getDept(iotMeasureBookRespVO.getDeptId());
+                if(Objects.nonNull(dept)){
+                    iotMeasureBookRespVO.setDeptName(dept.getName());
+                }
+            }
+            return iotMeasureBookRespVO;
+        }).collect(Collectors.toList());
+        return success(new PageResult<>(collect, pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureBookRespVO.java

@@ -72,6 +72,9 @@ public class IotMeasureBookRespVO {
 //    @ExcelProperty("部门id")
     private Long deptId;
 
+    @Schema(description = "部门名称")
+    private String deptName;
+
     @Schema(description = "检测是否到期")
     private Boolean expired;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/hazard/IotHazardDO.java

@@ -30,6 +30,14 @@ public class IotHazardDO extends BaseDO {
      * 状态
      */
     private String status;
+    /**
+     * 隐患排查分类
+     */
+    private String classify;
+    /**
+     * 隐患排查来源
+     */
+    private String source;
     /**
      * 地点
      */