From b8c89d5f7819d637b833d7e0b641504f95aba86d Mon Sep 17 00:00:00 2001 From: YBP Date: Tue, 24 Feb 2026 13:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AE=B0=E5=BD=95=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=98=8E=E7=BB=86=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/recordrecord/RecordRecordController.java | 6 +++--- .../record/service/recordrecord/RecordRecordService.java | 2 +- .../service/recordrecord/RecordRecordServiceImpl.java | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java index 38e8cae5..1f5861d6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java @@ -77,9 +77,9 @@ public class RecordRecordController extends AbstractFileUploadController impleme @PutMapping("/update") @Operation(summary = "更新文件、模板、记录") //@PreAuthorize("@ss.hasPermission('qms:record-record:update')") - public CommonResult updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) { - recordRecordService.updateRecordRecord(updateReqVO); - return success(BeanUtils.toBean(updateReqVO, RecordRecordSaveReqVO.class)); + public CommonResult updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) { + RecordRecordRespVO recordRecordRespVO = recordRecordService.updateRecordRecord(updateReqVO); + return success(recordRecordRespVO); } @DeleteMapping("/delete") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java index e96f9846..c3da8e56 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java @@ -29,7 +29,7 @@ public interface RecordRecordService { * * @param updateReqVO 更新信息 */ - void updateRecordRecord(@Valid RecordRecordSaveReqVO updateReqVO); + RecordRecordRespVO updateRecordRecord(@Valid RecordRecordSaveReqVO updateReqVO); /** * 删除文件、模板、记录 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java index 1221cc42..f151721c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java @@ -88,7 +88,7 @@ public class RecordRecordServiceImpl implements RecordRecordService { return BeanUtils.toBean(recordRecord, RecordRecordRespVO.class); } - public void saveDataWithNewVersion(RecordRecordDO createReqVO) { + public RecordRecordRespVO saveDataWithNewVersion(RecordRecordDO createReqVO) { RecordRecordDO recordRecordDO = BeanUtils.toBean(createReqVO, RecordRecordDO.class); recordRecordDO.setCurrentFlag(0); try { @@ -103,6 +103,8 @@ public class RecordRecordServiceImpl implements RecordRecordService { recordRecordDO.setMainId(createReqVO.getMainId()); recordRecordDO.setVersion(recordRecordDO.getNewVersion());// 新版本号 recordRecordMapper.insert(recordRecordDO); + // 返回 + return BeanUtils.toBean(recordRecordDO, RecordRecordRespVO.class); } catch (Exception e) { throw new RuntimeException("save new version error"); } @@ -110,7 +112,7 @@ public class RecordRecordServiceImpl implements RecordRecordService { @Override @Transactional(rollbackFor = Exception.class) - public void updateRecordRecord(RecordRecordSaveReqVO updateReqVO) { + public RecordRecordRespVO updateRecordRecord(RecordRecordSaveReqVO updateReqVO) { // 校验存在 validateRecordRecordExists(updateReqVO.getId()); handleFileParam(updateReqVO); @@ -125,10 +127,11 @@ public class RecordRecordServiceImpl implements RecordRecordService { // TODO } // 创建新版本 - saveDataWithNewVersion(updateObj); + return saveDataWithNewVersion(updateObj); } // 更新 businessFileService.deleteBusinessFileList(updateReqVO.getDeleteFileIdList()); + return BeanUtils.toBean(updateReqVO, RecordRecordRespVO.class); } @Override