文件记录分类明细修改文件上传bug
This commit is contained in:
@@ -77,9 +77,9 @@ public class RecordRecordController extends AbstractFileUploadController impleme
|
|||||||
@PutMapping("/update")
|
@PutMapping("/update")
|
||||||
@Operation(summary = "更新文件、模板、记录")
|
@Operation(summary = "更新文件、模板、记录")
|
||||||
//@PreAuthorize("@ss.hasPermission('qms:record-record:update')")
|
//@PreAuthorize("@ss.hasPermission('qms:record-record:update')")
|
||||||
public CommonResult<RecordRecordSaveReqVO> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
|
public CommonResult<RecordRecordRespVO> updateRecordRecord(@Valid @RequestBody RecordRecordSaveReqVO updateReqVO) {
|
||||||
recordRecordService.updateRecordRecord(updateReqVO);
|
RecordRecordRespVO recordRecordRespVO = recordRecordService.updateRecordRecord(updateReqVO);
|
||||||
return success(BeanUtils.toBean(updateReqVO, RecordRecordSaveReqVO.class));
|
return success(recordRecordRespVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DeleteMapping("/delete")
|
@DeleteMapping("/delete")
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public interface RecordRecordService {
|
|||||||
*
|
*
|
||||||
* @param updateReqVO 更新信息
|
* @param updateReqVO 更新信息
|
||||||
*/
|
*/
|
||||||
void updateRecordRecord(@Valid RecordRecordSaveReqVO updateReqVO);
|
RecordRecordRespVO updateRecordRecord(@Valid RecordRecordSaveReqVO updateReqVO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除文件、模板、记录
|
* 删除文件、模板、记录
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
|||||||
return BeanUtils.toBean(recordRecord, RecordRecordRespVO.class);
|
return BeanUtils.toBean(recordRecord, RecordRecordRespVO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void saveDataWithNewVersion(RecordRecordDO createReqVO) {
|
public RecordRecordRespVO saveDataWithNewVersion(RecordRecordDO createReqVO) {
|
||||||
RecordRecordDO recordRecordDO = BeanUtils.toBean(createReqVO, RecordRecordDO.class);
|
RecordRecordDO recordRecordDO = BeanUtils.toBean(createReqVO, RecordRecordDO.class);
|
||||||
recordRecordDO.setCurrentFlag(0);
|
recordRecordDO.setCurrentFlag(0);
|
||||||
try {
|
try {
|
||||||
@@ -103,6 +103,8 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
|||||||
recordRecordDO.setMainId(createReqVO.getMainId());
|
recordRecordDO.setMainId(createReqVO.getMainId());
|
||||||
recordRecordDO.setVersion(recordRecordDO.getNewVersion());// 新版本号
|
recordRecordDO.setVersion(recordRecordDO.getNewVersion());// 新版本号
|
||||||
recordRecordMapper.insert(recordRecordDO);
|
recordRecordMapper.insert(recordRecordDO);
|
||||||
|
// 返回
|
||||||
|
return BeanUtils.toBean(recordRecordDO, RecordRecordRespVO.class);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException("save new version error");
|
throw new RuntimeException("save new version error");
|
||||||
}
|
}
|
||||||
@@ -110,7 +112,7 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void updateRecordRecord(RecordRecordSaveReqVO updateReqVO) {
|
public RecordRecordRespVO updateRecordRecord(RecordRecordSaveReqVO updateReqVO) {
|
||||||
// 校验存在
|
// 校验存在
|
||||||
validateRecordRecordExists(updateReqVO.getId());
|
validateRecordRecordExists(updateReqVO.getId());
|
||||||
handleFileParam(updateReqVO);
|
handleFileParam(updateReqVO);
|
||||||
@@ -125,10 +127,11 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
|||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
// 创建新版本
|
// 创建新版本
|
||||||
saveDataWithNewVersion(updateObj);
|
return saveDataWithNewVersion(updateObj);
|
||||||
}
|
}
|
||||||
// 更新
|
// 更新
|
||||||
businessFileService.deleteBusinessFileList(updateReqVO.getDeleteFileIdList());
|
businessFileService.deleteBusinessFileList(updateReqVO.getDeleteFileIdList());
|
||||||
|
return BeanUtils.toBean(updateReqVO, RecordRecordRespVO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user