代码提交

This commit is contained in:
liang.chao 2025-09-25 15:47:35 +08:00
parent 6830350411
commit 752d02c23d
2 changed files with 14 additions and 3 deletions

View File

@ -10,6 +10,7 @@ import com.bonus.common.enums.OperaType;
import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.ArchivalCatalogueDto;
import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.SelectDto;
import com.bonus.web.domain.vo.ArchivalCatalogueVo; import com.bonus.web.domain.vo.ArchivalCatalogueVo;
import com.bonus.web.mapper.ArchiveMapper;
import com.bonus.web.service.ArchiveService; import com.bonus.web.service.ArchiveService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -33,6 +34,9 @@ public class ArchiveController extends BaseController {
@Autowired @Autowired
private ArchiveService service; private ArchiveService service;
@Autowired
private ArchiveMapper archiveMapper;
@ApiOperation(value = "档案目录") @ApiOperation(value = "档案目录")
@GetMapping("getArchivalCatalogueTree") @GetMapping("getArchivalCatalogueTree")
@SysLog(title = "档案目录", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "查询档案目录", logType = 1) @SysLog(title = "档案目录", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "查询档案目录", logType = 1)
@ -140,6 +144,13 @@ public class ArchiveController extends BaseController {
@RequiresPermissions("archive:catalogue:edit") @RequiresPermissions("archive:catalogue:edit")
public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) { public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
try { try {
ArchivalCatalogueDto dto = new ArchivalCatalogueDto();
dto.setId(vo.getId());
// 如果子集有数据 无法修改
Integer child = archiveMapper.getchild(dto);
if (child > 0){
return R.fail("该节点下有子集,无法修改");
}
Integer num = service.geMaxSort(vo.getParentId().toString()); Integer num = service.geMaxSort(vo.getParentId().toString());
if (num == null) { if (num == null) {
num = 0; num = 0;
@ -165,7 +176,7 @@ public class ArchiveController extends BaseController {
if (i > 0) { if (i > 0) {
return R.ok(); return R.ok();
} else { } else {
return R.fail("删除失败"); return R.fail("该节点下有子集,无法删除");
} }
} catch (Exception e) { } catch (Exception e) {
log.error(e.toString(), e); log.error(e.toString(), e);

View File

@ -60,9 +60,9 @@ public class FileTransferRecordController extends BaseController {
return AjaxResult.error("请求出错了"); return AjaxResult.error("请求出错了");
} }
} }
@ApiOperation(value = "档案移交清单详情") @ApiOperation(value = "档案移交清单文件")
@GetMapping("getTransferRecordFiles") @GetMapping("getTransferRecordFiles")
@SysLog(title = "档案移交清单详情", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "档案移交清单详情", logType = 1) @SysLog(title = "档案移交清单文件", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "档案移交清单文件", logType = 1)
public AjaxResult getTransferRecordFiles(TransferFileDto dto) { public AjaxResult getTransferRecordFiles(TransferFileDto dto) {
try { try {
List<TransferFileDto> recordFiles = transferApplyService.getTransferRecordFiles(dto); List<TransferFileDto> recordFiles = transferApplyService.getTransferRecordFiles(dto);