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 saveMaintainVo(@RequestBody DeviceMaintainVO vo) { - return deviceMaintainService.saveMaintainVo(vo); + public CommonResult saveMaintainVo(@RequestBody DeviceMaintainVO vo) { + CommonResult 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 saveMaintainVo(DeviceMaintainVO vo); + CommonResult saveMaintainVo(DeviceMaintainVO vo); CommonResult 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 saveMaintainVo(DeviceMaintainVO vo) { + public CommonResult saveMaintainVo(DeviceMaintainVO vo) { DeviceMaintainDO data = new DeviceMaintainDO(); BeanUtil.copyProperties(vo, data); deviceMaintainMapper.updateById(data); List maintainItemList = vo.getMaintainItemList(); deviceMaintainItemService.updateBatch(maintainItemList); - return CommonResult.success(true); + return CommonResult.success(data); } @Override