文件分类标记
This commit is contained in:
parent
5e7cf4ce34
commit
ff2bba596b
|
|
@ -85,6 +85,7 @@ public class ArchiveController extends BaseController {
|
||||||
return R.fail("请求出错了");
|
return R.fail("请求出错了");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "新增档案左侧目录")
|
@ApiOperation(value = "新增档案左侧目录")
|
||||||
@PostMapping("addLeft")
|
@PostMapping("addLeft")
|
||||||
@SysLog(title = "新增档案左侧目录", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增档案左侧目录", logType = 1)
|
@SysLog(title = "新增档案左侧目录", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增档案左侧目录", logType = 1)
|
||||||
|
|
@ -97,6 +98,10 @@ public class ArchiveController extends BaseController {
|
||||||
if (vo.getLevel() == null) {
|
if (vo.getLevel() == null) {
|
||||||
return R.fail("级别有误");
|
return R.fail("级别有误");
|
||||||
}
|
}
|
||||||
|
Integer num = service.geMaxSort(vo.getParentId().toString());
|
||||||
|
if (vo.getSort() <= num) {
|
||||||
|
return R.fail("排序序号需大于" + num);
|
||||||
|
}
|
||||||
Integer i = service.saveArchivalCatalogue(vo);
|
Integer i = service.saveArchivalCatalogue(vo);
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
return R.ok();
|
return R.ok();
|
||||||
|
|
@ -124,7 +129,7 @@ public class ArchiveController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "修改档案目录")
|
@ApiOperation(value = "修改档案目录")
|
||||||
@PostMapping("editLeft")
|
@PostMapping("editRight")
|
||||||
@SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1)
|
@SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1)
|
||||||
@RequiresPermissions("archive:catalogue:edit")
|
@RequiresPermissions("archive:catalogue:edit")
|
||||||
public R<List<ArchivalCatalogueDto>> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) {
|
public R<List<ArchivalCatalogueDto>> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) {
|
||||||
|
|
@ -140,12 +145,17 @@ public class ArchiveController extends BaseController {
|
||||||
return R.fail("请求出错了");
|
return R.fail("请求出错了");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "修改档案目录")
|
@ApiOperation(value = "修改档案目录")
|
||||||
@PostMapping("editRight")
|
@PostMapping("editLeft")
|
||||||
@SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1)
|
@SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1)
|
||||||
@RequiresPermissions("archive:catalogue:edit")
|
@RequiresPermissions("archive:catalogue:edit")
|
||||||
public R<List<ArchivalCatalogueDto>> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
|
public R<List<ArchivalCatalogueDto>> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
|
||||||
try {
|
try {
|
||||||
|
Integer num = service.geMaxSort(vo.getParentId().toString());
|
||||||
|
if (vo.getSort() <= num) {
|
||||||
|
return R.fail("排序序号需大于" + num);
|
||||||
|
}
|
||||||
Integer i = service.editArchivalCatalogue(vo);
|
Integer i = service.editArchivalCatalogue(vo);
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
return R.ok();
|
return R.ok();
|
||||||
|
|
@ -189,4 +199,17 @@ public class ArchiveController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "查询最大sort")
|
||||||
|
@GetMapping("geMaxSort")
|
||||||
|
@SysLog(title = "查询最大sort", module = "档案管理->查询最大sort", businessType = OperaType.QUERY, details = "查询最大sort", logType = 1)
|
||||||
|
public AjaxResult geMaxSort(String parentId) {
|
||||||
|
try {
|
||||||
|
Integer num = service.geMaxSort(parentId);
|
||||||
|
return AjaxResult.success(num);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error(e.toString(), e);
|
||||||
|
return AjaxResult.error("请求出错了");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,4 +30,6 @@ public interface ArchiveMapper {
|
||||||
Integer getchild(ArchivalCatalogueDto dto);
|
Integer getchild(ArchivalCatalogueDto dto);
|
||||||
|
|
||||||
List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto);
|
List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto);
|
||||||
|
|
||||||
|
Integer geMaxSort(String parentId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,6 @@ public interface ArchiveService {
|
||||||
ArchivalCatalogueDto getArchivalCatalogueById(ArchivalCatalogueDto dto);
|
ArchivalCatalogueDto getArchivalCatalogueById(ArchivalCatalogueDto dto);
|
||||||
|
|
||||||
List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto);
|
List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto);
|
||||||
|
|
||||||
|
Integer geMaxSort(String parentId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -82,4 +82,9 @@ public class ArchiveServiceImpl implements ArchiveService {
|
||||||
public List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto) {
|
public List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto) {
|
||||||
return archiveMapper.getFilesClassifyMarkSelect(dto);
|
return archiveMapper.getFilesClassifyMarkSelect(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Integer geMaxSort(String parentId) {
|
||||||
|
return archiveMapper.geMaxSort(parentId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -163,5 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
WHERE
|
WHERE
|
||||||
del_flag = '1'
|
del_flag = '1'
|
||||||
</select>
|
</select>
|
||||||
|
<select id="geMaxSort" resultType="java.lang.Integer">
|
||||||
|
select max(sort) from da_ky_files_contents where parent_id = #{parentId}
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue