档案自定义分类管理

bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java

@@ -13,6 +13,7 @@ import com.bonus.common.utils.DateUtils;
 import com.bonus.common.utils.SecurityUtils;
 import com.bonus.common.utils.StringUtils;
 import com.bonus.system.domain.KyDataClassify;
+import com.bonus.system.domain.vo.KyDataClassifyVo;
 import com.bonus.system.service.KyDataClassifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -119,7 +120,7 @@ public class KyDataClassifyController extends BaseController {
     @GetMapping("/listAll")
     public TableDataInfo listAll(KyDataClassify kyDataClassify)
     {
-        List<KyDataClassify> list = kyDataClassifyService.listAll(kyDataClassify);
+        List<KyDataClassifyVo> list = kyDataClassifyService.listAll(kyDataClassify);
         return getDataTable(list);
     }
 }

bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java

@@ -0,0 +1,29 @@
+package com.bonus.system.domain.vo;
+
+import com.bonus.system.domain.KyDataClassify;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 马三炮
+ * @date 2025/9/12
+ */
+@Data
+public class KyDataClassifyVo {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 列表
+     */
+    private List<KyDataClassify> kyDataClassifyList;
+}

bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java

@@ -1,6 +1,7 @@
 package com.bonus.system.mapper;
 
 import com.bonus.system.domain.KyDataClassify;
+import com.bonus.system.domain.vo.KyDataClassifyVo;
 
 import java.util.List;
 
@@ -48,4 +49,5 @@ public interface KyDataClassifyMapper {
      */
     KyDataClassify selectKyDataClassifyByDataTypeName(KyDataClassify kyDataClassify);
 
+    List<KyDataClassifyVo> getParenList();
 }

bonus-system/src/main/java/com/bonus/system/service/KyDataClassifyService.java

@@ -1,6 +1,7 @@
 package com.bonus.system.service;
 
 import com.bonus.system.domain.KyDataClassify;
+import com.bonus.system.domain.vo.KyDataClassifyVo;
 
 import java.util.List;
 
@@ -39,5 +40,5 @@ public interface KyDataClassifyService {
      * @param kyDataClassify
      * @return
      */
-    List<KyDataClassify> listAll(KyDataClassify kyDataClassify);
+    List<KyDataClassifyVo> listAll(KyDataClassify kyDataClassify);
 }

bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java

@@ -5,6 +5,7 @@ import com.bonus.common.utils.DateUtils;
 import com.bonus.common.utils.SecurityUtils;
 import com.bonus.common.utils.StringUtils;
 import com.bonus.system.domain.KyDataClassify;
+import com.bonus.system.domain.vo.KyDataClassifyVo;
 import com.bonus.system.mapper.KyDataClassifyMapper;
 import com.bonus.system.service.KyDataClassifyService;
 import lombok.extern.slf4j.Slf4j;
@@ -80,7 +81,17 @@ public class KyDataClassifyServiceImpl implements KyDataClassifyService {
      * @return
      */
     @Override
-    public List<KyDataClassify> listAll(KyDataClassify kyDataClassify) {
+    public List<KyDataClassifyVo> listAll(KyDataClassify kyDataClassify) {
-        return kyDataClassifyMapper.listAll(kyDataClassify);
+        //获取父级
+        List<KyDataClassifyVo> KyDataClassifyVoList = kyDataClassifyMapper.getParenList();
+        if (KyDataClassifyVoList.size()>0){
+            //获取子级
+            for (KyDataClassifyVo kyDataClassifyVo:KyDataClassifyVoList) {
+                kyDataClassify.setPid(kyDataClassifyVo.getId());
+                List<KyDataClassify> kyDataClassifyList = kyDataClassifyMapper.listAll(kyDataClassify);
+                kyDataClassifyVo.setKyDataClassifyList(kyDataClassifyList);
+            }
+        }
+        return KyDataClassifyVoList;
     }
 }

bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml

@@ -51,9 +51,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="dataTypeName!=null">
             and data_type_name  LIKE CONCAT('%', #{dataTypeName}, '%')
         </if>
+        <if test="dataTypeName!=null">
+            and data_type_name  LIKE CONCAT('%', #{dataTypeName}, '%')
+        </if>
     </select>
     <select id="selectKyDataClassifyByDataTypeName" resultType="com.bonus.system.domain.KyDataClassify">
         select id,data_type_name,remark,update_time,update_user_id,update_user_name
         from da_ky_data_classify where del_flag='1' and data_type_name = #{dataTypeName}
     </select>
+    <select id="getParenList" resultType="com.bonus.system.domain.vo.KyDataClassifyVo">
+        select dict_code as id,dict_label as name
+        from da_ky_sys_dict_data where dict_type = 'data_class_type' and status='0'
+    </select>
 </mapper>