计量器具上传

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

@@ -13,6 +13,8 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
 import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureBookService;
 import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureDetectService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,6 +45,8 @@ public class IotMeasureDetectController {
     private IotMeasureDetectService iotMeasureDetectService;
     @Autowired
     private IotMeasureBookService iotMeasureBookService;
+    @Autowired
+    private DeptApi deptApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建计量器具-检测校准明细")
@@ -88,8 +92,14 @@ public class IotMeasureDetectController {
             if (Objects.nonNull(iotMeasureDetectRespVO.getMeasureId())) {
                 IotMeasureBookDO iotMeasureBook = iotMeasureBookService.getIotMeasureBook(iotMeasureDetectRespVO.getMeasureId());
                 if (Objects.nonNull(iotMeasureBook)) {
-                    iotMeasureDetectRespVO.setMeasureName(iotMeasureDetectRespVO.getMeasureName());
-                    iotMeasureDetectRespVO.setMeasureCode(iotMeasureDetectRespVO.getMeasureCode());
+                    iotMeasureDetectRespVO.setMeasureName(iotMeasureBook.getMeasureName());
+                    iotMeasureDetectRespVO.setMeasureCode(iotMeasureBook.getMeasureCode());
+                }
+            }
+            if (Objects.nonNull(iotMeasureDetectRespVO.getDeptId())) {
+                DeptRespDTO dept = deptApi.getDept(iotMeasureDetectRespVO.getDeptId());
+                if(Objects.nonNull(dept)){
+                    iotMeasureDetectRespVO.setDeptName(dept.getName());
                 }
             }
             return iotMeasureDetectRespVO;

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

@@ -53,4 +53,5 @@ public class IotMeasureDetectRespVO {
     private String detectStandard;
     private String measureName;
     private String measureCode;
+    private String deptName;
 }