文件分类标记

bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java

@@ -107,7 +107,7 @@ public class ArchiveController extends BaseController {
     @ApiOperation(value = "查询单个档案记录")
     @GetMapping("getArchivalCatalogueById")
     @SysLog(title = "查询单个档案记录", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "查询单个档案记录", logType = 1)
-    @RequiresPermissions("archive:catalogue:edit")
+    @RequiresPermissions("archive:catalogue:query")
     public R<ArchivalCatalogueDto> getArchivalCatalogueById(ArchivalCatalogueDto dto) {
         try {
             ArchivalCatalogueDto archivalCatalogueDto = service.getArchivalCatalogueById(dto);
@@ -138,7 +138,8 @@ public class ArchiveController extends BaseController {
     public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
         try {
             Integer num = service.geMaxSort(vo.getParentId().toString());
-            if (vo.getSort() <= num) {
+            int sort = service.getSortById(vo.getId());
+            if (sort != vo.getSort() && vo.getSort() <= num) {
                 return R.fail("排序序号需大于" + num);
             }
             return service.editArchivalCatalogue(vo);

bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java

@@ -35,4 +35,8 @@ public interface ArchiveMapper {
 
     Integer getArchivalCatalogueByName(ArchivalCatalogueDto dto);
     Integer getArchivalCatalogueByName(ArchivalCatalogueVo dto);
+
+    Integer getSortById(Integer id);
+
+    String getClassifyMark(ArchivalCatalogueDto dto);
 }

bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java

@@ -30,4 +30,6 @@ public interface ArchiveService {
     List<SelectDto> getFilesClassifyMarkSelect(ArchivalCatalogueDto dto);
 
     Integer geMaxSort(String parentId);
+
+    Integer getSortById(Integer id);
 }

bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java

@@ -93,7 +93,11 @@ public class ArchiveServiceImpl implements ArchiveService {
 
     @Override
     public ArchivalCatalogueDto getArchivalCatalogueById(ArchivalCatalogueDto dto) {
-        return archiveMapper.getArchivalCatalogueById(dto);
+        ArchivalCatalogueDto archivalCatalogueDto = archiveMapper.getArchivalCatalogueById(dto);
+        if (archivalCatalogueDto != null && archivalCatalogueDto.getLevel() == 4){
+            archivalCatalogueDto.setClassifyMark(archiveMapper.getClassifyMark(dto));
+        }
+        return archivalCatalogueDto;
     }
 
     @Override
@@ -105,4 +109,9 @@ public class ArchiveServiceImpl implements ArchiveService {
     public Integer geMaxSort(String parentId) {
         return archiveMapper.geMaxSort(parentId);
     }
+
+    @Override
+    public Integer getSortById(Integer id) {
+        return archiveMapper.getSortById(id);
+    }
 }

bonus-admin/src/main/resources/mapper/ArchiveMapper.xml

@@ -95,30 +95,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getArchivalCatalogue" resultType="com.bonus.web.domain.ArchivalCatalogueDto">
 		SELECT
-		id,
-		content_name AS contentName,
-		parent_id AS parentId,
-		`level` AS level,
-		sort,
-		mark_code AS markCode,
-		term,
-		unit_name AS unitName,
-		major,
-		classify_mark AS classifyMark,
-		create_time AS createTime,
-		update_time AS updateTime,
-		create_user_id AS createUserId,
-		create_user_name AS createUserName,
-		update_user_id AS updateUserId,
-		update_user_name AS updateUserName
+		dkfc.id,
+		dkfc.content_name AS contentName,
+		dkfc.parent_id AS parentId,
+		dkfc.`level` AS level,
+		dkfc.sort,
+		dkfc.mark_code AS markCode,
+		dkfc.term,
+		dkfc.unit_name AS unitName,
+		dkfc.major,
+		dkfcm.classify_mark_name AS classifyMark,
+		dkfc.create_time AS createTime,
+		dkfc.update_time AS updateTime,
+		dkfc.create_user_id AS createUserId,
+		dkfc.create_user_name AS createUserName,
+		dkfc.update_user_id AS updateUserId,
+		dkfc.update_user_name AS updateUserName
 		FROM
-		da_ky_files_contents
+		da_ky_files_contents dkfc
+		left join da_ky_files_classify_mark dkfcm on dkfcm.id = dkfc.classify_mark
 		WHERE
-		del_flag = '1' and parent_id = #{parentId} and level = 4
+		dkfc.del_flag = '1' and dkfc.parent_id = #{parentId} and dkfc.level = 4
 		<if test="contentName != null and contentName != ''">
-			and content_name like concat('%', #{contentName}, '%')
+			and dkfc.content_name like concat('%', #{contentName}, '%')
 		</if>
-		order by create_time desc
+		order by dkfc.create_time desc
 	</select>
 	<select id="getArchivalCatalogueById" resultType="com.bonus.web.domain.ArchivalCatalogueDto">
 		SELECT
@@ -173,5 +174,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and id != #{id}
 		</if>
 	</select>
+	<select id="getSortById" resultType="java.lang.Integer">
+		select sort from da_ky_files_contents where id = #{id}
+	</select>
+	<select id="getClassifyMark" resultType="java.lang.String">
+		select dkfcm.classify_mark_name from da_ky_files_contents dkfc
+		   left join da_ky_files_classify_mark dkfcm on dkfc.classify_mark = dkfcm.id
+		where dkfc.id = #{id}
+	</select>
 
 </mapper>