From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 14 十月 2022 11:19:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010 --- flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java index 74f4505..65d319a 100644 --- a/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java +++ b/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java @@ -3,18 +3,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dg.core.ResultData; import com.dg.core.db.gen.entity.ClassifyAdministration; import com.dg.core.db.gen.entity.TransactionEvent; import com.dg.core.db.gen.mapper.ClassifyAdministrationMapper; +import com.dg.core.db.gen.mapper.TransactionEventMapper; import com.dg.core.service.IClassifyAdministrationService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; @Service public class ClassifyAdministrationImpl extends ServiceImpl<ClassifyAdministrationMapper, ClassifyAdministration> implements IClassifyAdministrationService { + + + @Resource + private TransactionEventMapper transactionEventMapper; @Override public List<ClassifyAdministration> selectConfigList(String classifyName, String classifyGrade) { @@ -46,6 +53,29 @@ } @Override + public ResultData queryListById(Integer id){ + if (id.equals(0)){ + return ResultData.success(baseMapper.selectList(new QueryWrapper<ClassifyAdministration>().lambda() + .eq(ClassifyAdministration::getParentId,0))); + } + ClassifyAdministration classifyAdministration = baseMapper.selectOne(new QueryWrapper<ClassifyAdministration>().lambda() + .eq(ClassifyAdministration::getId, id)); + if (classifyAdministration.getClassifyGrade().equals("1")){ + return ResultData.success(baseMapper.selectList(new QueryWrapper<ClassifyAdministration>().lambda() + .eq(ClassifyAdministration::getParentId,classifyAdministration.getId()))); + }else if (classifyAdministration.getClassifyGrade().equals("2")){ + return ResultData.success(transactionEventMapper.queryByClassifyIdList(id.toString(),null)); + } + return ResultData.error(); + } + + @Override + public List<String> selectParent(String parentId) { + return baseMapper.selectParent(parentId); + } + + + @Override public int insertConfig(ClassifyAdministration entity) { return baseMapper.insertConfig(entity); } -- Gitblit v1.7.1