diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java index 9966123..d77ccfa 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java +++ b/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 list = kyDataClassifyService.listAll(kyDataClassify); + List list = kyDataClassifyService.listAll(kyDataClassify); return getDataTable(list); } } diff --git a/bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java b/bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java new file mode 100644 index 0000000..2bd401c --- /dev/null +++ b/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 kyDataClassifyList; +} diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java index 4ab1e60..56639ca 100644 --- a/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java +++ b/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 getParenList(); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/KyDataClassifyService.java b/bonus-system/src/main/java/com/bonus/system/service/KyDataClassifyService.java index 4161d02..f54be3c 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/KyDataClassifyService.java +++ b/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 listAll(KyDataClassify kyDataClassify); + List listAll(KyDataClassify kyDataClassify); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java index 85811b2..0610390 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java +++ b/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 listAll(KyDataClassify kyDataClassify) { - return kyDataClassifyMapper.listAll(kyDataClassify); + public List listAll(KyDataClassify kyDataClassify) { + //获取父级 + List KyDataClassifyVoList = kyDataClassifyMapper.getParenList(); + if (KyDataClassifyVoList.size()>0){ + //获取子级 + for (KyDataClassifyVo kyDataClassifyVo:KyDataClassifyVoList) { + kyDataClassify.setPid(kyDataClassifyVo.getId()); + List kyDataClassifyList = kyDataClassifyMapper.listAll(kyDataClassify); + kyDataClassifyVo.setKyDataClassifyList(kyDataClassifyList); + } + } + return KyDataClassifyVoList; } } diff --git a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml index b72956b..9631950 100644 --- a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml @@ -51,9 +51,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and data_type_name LIKE CONCAT('%', #{dataTypeName}, '%') + + and data_type_name LIKE CONCAT('%', #{dataTypeName}, '%') + +