From fa306e8ff70ca3215fdcde6b9734cf6e2f84ea52 Mon Sep 17 00:00:00 2001
From: FCL <fantoutou@163.com>
Date: Fri, 13 Mar 2026 12:03:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=B4=E6=8A=A4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/controller/admin/DeviceMaintainController.java | 8 ++++++--
 .../resource/device/service/DeviceMaintainService.java    | 2 +-
 .../device/service/DeviceMaintainServiceImpl.java         | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java
index 0ad32f0c..01d59372 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java
@@ -62,8 +62,12 @@ public class DeviceMaintainController extends AbstractFileUploadController imple
 
     @PostMapping("/saveMaintainVo")
     @Operation(summary = "创建或获取维护数据")
-    public CommonResult<Boolean> saveMaintainVo(@RequestBody DeviceMaintainVO vo) {
-        return deviceMaintainService.saveMaintainVo(vo);
+    public CommonResult<DeviceMaintainRespVO> saveMaintainVo(@RequestBody DeviceMaintainVO vo) {
+        CommonResult<DeviceMaintainDO> ret =  deviceMaintainService.saveMaintainVo(vo);
+        if(!ret.isSuccess())
+            return ret.error(ret.getCode(), ret.getMsg());
+        DeviceMaintainDO entity = ret.getData();
+        return success(BeanUtils.toBean(entity, DeviceMaintainRespVO.class));
     }
 
     @PostMapping("/createOrGet")
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java
index ad0eed78..3fafd205 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java
@@ -17,7 +17,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
  */
 public interface DeviceMaintainService {
 
-    CommonResult<Boolean> saveMaintainVo(DeviceMaintainVO vo);
+    CommonResult<DeviceMaintainDO> saveMaintainVo(DeviceMaintainVO vo);
 
     CommonResult<DeviceMaintainVO> createOrGet(Long deviceId, String date, String dataType);
 
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java
index 421ff3a7..e49d2605 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java
@@ -51,13 +51,13 @@ public class DeviceMaintainServiceImpl implements DeviceMaintainService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CommonResult<Boolean> saveMaintainVo(DeviceMaintainVO vo) {
+    public CommonResult<DeviceMaintainDO> saveMaintainVo(DeviceMaintainVO vo) {
         DeviceMaintainDO data = new DeviceMaintainDO();
         BeanUtil.copyProperties(vo, data);
         deviceMaintainMapper.updateById(data);
         List<DeviceMaintainItemDO> maintainItemList = vo.getMaintainItemList();
         deviceMaintainItemService.updateBatch(maintainItemList);
-        return CommonResult.success(true);
+        return CommonResult.success(data);
     }
 
     @Override