zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
FCL
2026-02-24 14:04:02 +08:00
parent 195703718d b8c89d5f78
commit 0fe155e89b
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java
View File

@@ -77,9 +77,9 @@ public class RecordRecordController extends AbstractFileUploadController impleme
@PutMapping("/update")
@Operation(summary = "更新文件、模板、记录")
//@PreAuthorize("@ss.hasPermission('qms:record-record:update')")
public CommonResult<RecordRecordSaveReqVO> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
recordRecordService.updateRecordRecord(updateReqVO);
return success(BeanUtils.toBean(updateReqVO, RecordRecordSaveReqVO.class));
public CommonResult<RecordRecordRespVO> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
RecordRecordRespVO recordRecordRespVO = recordRecordService.updateRecordRecord(updateReqVO);
return success(recordRecordRespVO);
}
@DeleteMapping("/delete")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java
View File

@@ -29,7 +29,7 @@ public interface RecordRecordService {
*
* @param updateReqVO 更新信息
*/
void updateRecordRecord(@Valid RecordRecordSaveReqVO updateReqVO);
RecordRecordRespVO updateRecordRecord(@Valid RecordRecordSaveReqVO updateReqVO);
/**
* 删除文件、模板、记录

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java
View File

@@ -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