文件分类标记
This commit is contained in:
parent
ff2bba596b
commit
8e22123f68
|
|
@ -74,12 +74,7 @@ public class ArchiveController extends BaseController {
|
|||
if (dto.getLevel() == null) {
|
||||
return R.fail("级别有误");
|
||||
}
|
||||
Integer i = service.saveArchivalCatalogue(dto);
|
||||
if (i > 0) {
|
||||
return R.ok();
|
||||
} else {
|
||||
return R.fail("新增失败");
|
||||
}
|
||||
return service.saveArchivalCatalogue(dto);
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
return R.fail("请求出错了");
|
||||
|
|
@ -102,12 +97,8 @@ public class ArchiveController extends BaseController {
|
|||
if (vo.getSort() <= num) {
|
||||
return R.fail("排序序号需大于" + num);
|
||||
}
|
||||
Integer i = service.saveArchivalCatalogue(vo);
|
||||
if (i > 0) {
|
||||
return R.ok();
|
||||
} else {
|
||||
return R.fail("新增失败");
|
||||
}
|
||||
return service.saveArchivalCatalogue(vo);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
return R.fail("请求出错了");
|
||||
|
|
@ -132,14 +123,9 @@ public class ArchiveController extends BaseController {
|
|||
@PostMapping("editRight")
|
||||
@SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1)
|
||||
@RequiresPermissions("archive:catalogue:edit")
|
||||
public R<List<ArchivalCatalogueDto>> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) {
|
||||
public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) {
|
||||
try {
|
||||
Integer i = service.editArchivalCatalogue(dto);
|
||||
if (i > 0) {
|
||||
return R.ok();
|
||||
} else {
|
||||
return R.fail("修改失败");
|
||||
}
|
||||
return service.editArchivalCatalogue(dto);
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
return R.fail("请求出错了");
|
||||
|
|
@ -150,18 +136,13 @@ public class ArchiveController extends BaseController {
|
|||
@PostMapping("editLeft")
|
||||
@SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1)
|
||||
@RequiresPermissions("archive:catalogue:edit")
|
||||
public R<List<ArchivalCatalogueDto>> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
|
||||
public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
|
||||
try {
|
||||
Integer num = service.geMaxSort(vo.getParentId().toString());
|
||||
if (vo.getSort() <= num) {
|
||||
return R.fail("排序序号需大于" + num);
|
||||
}
|
||||
Integer i = service.editArchivalCatalogue(vo);
|
||||
if (i > 0) {
|
||||
return R.ok();
|
||||
} else {
|
||||
return R.fail("修改失败");
|
||||
}
|
||||
return service.editArchivalCatalogue(vo);
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
return R.fail("请求出错了");
|
||||
|
|
|
|||
|
|
@ -32,4 +32,7 @@ public interface ArchiveMapper {
|
|||
List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto);
|
||||
|
||||
Integer geMaxSort(String parentId);
|
||||
|
||||
Integer getArchivalCatalogueByName(ArchivalCatalogueDto dto);
|
||||
Integer getArchivalCatalogueByName(ArchivalCatalogueVo dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.bonus.web.service;
|
||||
|
||||
import com.bonus.common.core.domain.AjaxResult;
|
||||
import com.bonus.common.core.domain.R;
|
||||
import com.bonus.web.domain.ArchivalCatalogueDto;
|
||||
import com.bonus.web.domain.SelectDto;
|
||||
import com.bonus.web.domain.vo.ArchivalCatalogueVo;
|
||||
|
|
@ -13,13 +15,13 @@ import java.util.List;
|
|||
public interface ArchiveService {
|
||||
List<ArchivalCatalogueDto> getArchivalCatalogueTree(ArchivalCatalogueDto dto);
|
||||
|
||||
Integer saveArchivalCatalogue(ArchivalCatalogueDto dto);
|
||||
Integer saveArchivalCatalogue(ArchivalCatalogueVo vo);
|
||||
R saveArchivalCatalogue(ArchivalCatalogueDto dto);
|
||||
R saveArchivalCatalogue(ArchivalCatalogueVo vo);
|
||||
|
||||
List<ArchivalCatalogueDto> getArchivalCatalogue(ArchivalCatalogueDto dto);
|
||||
|
||||
Integer editArchivalCatalogue(ArchivalCatalogueDto dto);
|
||||
Integer editArchivalCatalogue(ArchivalCatalogueVo dto);
|
||||
R editArchivalCatalogue(ArchivalCatalogueDto dto);
|
||||
R editArchivalCatalogue(ArchivalCatalogueVo dto);
|
||||
|
||||
Integer delArchivalCatalogue(ArchivalCatalogueDto dto);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.bonus.web.service.impl;
|
||||
|
||||
import com.bonus.common.core.domain.AjaxResult;
|
||||
import com.bonus.common.core.domain.R;
|
||||
import com.bonus.common.utils.SecurityUtils;
|
||||
import com.bonus.web.controller.tool.TreeBuilder;
|
||||
import com.bonus.web.domain.ArchivalCatalogueDto;
|
||||
|
|
@ -31,17 +33,25 @@ public class ArchiveServiceImpl implements ArchiveService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Integer saveArchivalCatalogue(ArchivalCatalogueDto dto) {
|
||||
public R saveArchivalCatalogue(ArchivalCatalogueDto dto) {
|
||||
Integer archivalCatalogueByName = archiveMapper.getArchivalCatalogueByName(dto);
|
||||
if (archivalCatalogueByName > 0) {
|
||||
return R.fail("该名称已存在");
|
||||
}
|
||||
dto.setCreateUserId(SecurityUtils.getLoginUser().getUserId().toString());
|
||||
dto.setCreateUserName(SecurityUtils.getLoginUser().getUsername());
|
||||
return archiveMapper.saveArchivalCatalogue(dto);
|
||||
return R.ok(archiveMapper.saveArchivalCatalogue(dto));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer saveArchivalCatalogue(ArchivalCatalogueVo vo) {
|
||||
public R saveArchivalCatalogue(ArchivalCatalogueVo vo) {
|
||||
Integer archivalCatalogueByName = archiveMapper.getArchivalCatalogueByName(vo);
|
||||
if (archivalCatalogueByName > 0) {
|
||||
return R.fail("该名称已存在");
|
||||
}
|
||||
vo.setCreateUserId(SecurityUtils.getLoginUser().getUserId().toString());
|
||||
vo.setCreateUserName(SecurityUtils.getLoginUser().getUsername());
|
||||
return archiveMapper.saveArchivalCatalogue(vo);
|
||||
return R.ok(archiveMapper.saveArchivalCatalogue(vo));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -50,17 +60,25 @@ public class ArchiveServiceImpl implements ArchiveService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Integer editArchivalCatalogue(ArchivalCatalogueDto dto) {
|
||||
public R editArchivalCatalogue(ArchivalCatalogueDto dto) {
|
||||
Integer archivalCatalogueByName = archiveMapper.getArchivalCatalogueByName(dto);
|
||||
if (archivalCatalogueByName > 0) {
|
||||
return R.fail("该名称已存在");
|
||||
}
|
||||
dto.setUpdateUserId(SecurityUtils.getLoginUser().getUserId().toString());
|
||||
dto.setUpdateUserName(SecurityUtils.getLoginUser().getUsername());
|
||||
return archiveMapper.editArchivalCatalogue(dto);
|
||||
return R.ok(archiveMapper.editArchivalCatalogue(dto));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer editArchivalCatalogue(ArchivalCatalogueVo dto) {
|
||||
public R editArchivalCatalogue(ArchivalCatalogueVo dto) {
|
||||
Integer archivalCatalogueByName = archiveMapper.getArchivalCatalogueByName(dto);
|
||||
if (archivalCatalogueByName > 0) {
|
||||
return R.fail("该名称已存在");
|
||||
}
|
||||
dto.setUpdateUserId(SecurityUtils.getLoginUser().getUserId().toString());
|
||||
dto.setUpdateUserName(SecurityUtils.getLoginUser().getUsername());
|
||||
return archiveMapper.editArchivalCatalogue(dto);
|
||||
return R.ok(archiveMapper.editArchivalCatalogue(dto));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -166,5 +166,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="geMaxSort" resultType="java.lang.Integer">
|
||||
select max(sort) from da_ky_files_contents where parent_id = #{parentId}
|
||||
</select>
|
||||
<select id="getArchivalCatalogueByName" resultType="java.lang.Integer">
|
||||
select count(*) from da_ky_files_contents where content_name = #{contentName}
|
||||
and parent_id = #{parentId} and del_flag = '1'
|
||||
<if test="id != null">
|
||||
and id != #{id}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue