fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopCourseEducationTypeController.java

@@ -13,11 +13,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 教育类型Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-10-08
  */
@@ -39,4 +40,19 @@ public class TopCourseEducationTypeController extends BaseController {
         List<TopCourseEducationTypeVo> list = iCourseEducationTypeService.queryList(bo);
         return getDataTable(list);
     }
+
+    /**
+     * 查询教育类型列表
+     */
+    @ApiOperation("查询所有业务层次列表")
+    @GetMapping("/allList")
+    public TableDataInfo<TopCourseEducationTypeVo> allList(TopCourseEducationTypeQueryBo bo) {
+        startPage();
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(1);
+        statusList.add(0);
+        bo.setStatusList(statusList);
+        List<TopCourseEducationTypeVo> list = iCourseEducationTypeService.queryAllList(bo);
+        return getDataTable(list);
+    }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopCostTpController.java

@@ -3,11 +3,12 @@ package com.zhongzheng.controller.financial;
 import java.util.List;
 import java.util.Arrays;
 
-import com.zhongzheng.modules.financial.bo.TopCostTpAddBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpEditBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpQueryBo;
-import com.zhongzheng.modules.financial.service.ITopCostTpService;
-import com.zhongzheng.modules.financial.vo.TopCostTpVo;
+
+import com.zhongzheng.modules.top.financial.bo.TopCostTpAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo;
+import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/bo/TopCostTpAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpAddBo.java

@@ -1,10 +1,9 @@
-package com.zhongzheng.modules.financial.bo;
+package com.zhongzheng.modules.top.financial.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
+
 import java.util.List;
 
 
@@ -35,4 +34,6 @@ public class TopCostTpAddBo {
     /** 默认选择状态 1选中 0非选中 */
     @ApiModelProperty("默认选择状态 1选中 0非选中")
     private Integer defaultStatus;
+    @ApiModelProperty("机构ID")
+    private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/bo/TopCostTpEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpEditBo.java

@@ -1,10 +1,9 @@
-package com.zhongzheng.modules.financial.bo;
+package com.zhongzheng.modules.top.financial.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
+
 import java.util.List;
 
 
@@ -39,4 +38,6 @@ public class TopCostTpEditBo {
     /** 默认选择状态 1选中 0非选中 */
     @ApiModelProperty("默认选择状态 1选中 0非选中")
     private Integer defaultStatus;
+    @ApiModelProperty("机构ID")
+    private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/bo/TopCostTpItemAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemAddBo.java

@@ -1,11 +1,8 @@
-package com.zhongzheng.modules.financial.bo;
+package com.zhongzheng.modules.top.financial.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
-
 
 import java.math.BigDecimal;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/bo/TopCostTpItemEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemEditBo.java

@@ -1,10 +1,8 @@
-package com.zhongzheng.modules.financial.bo;
+package com.zhongzheng.modules.top.financial.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
 
 import java.math.BigDecimal;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/bo/TopCostTpItemQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemQueryBo.java

@@ -1,16 +1,12 @@
-package com.zhongzheng.modules.financial.bo;
+package com.zhongzheng.modules.top.financial.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
 import java.math.BigDecimal;
-import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
  * 成本模板子项分页查询对象 top_cost_tp_item

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/bo/TopCostTpQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpQueryBo.java

@@ -1,16 +1,11 @@
-package com.zhongzheng.modules.financial.bo;
+package com.zhongzheng.modules.top.financial.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
 /**
  * 成本模板分页查询对象 top_cost_tp
  *
@@ -42,4 +37,6 @@ public class TopCostTpQueryBo extends BaseEntity {
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
 	private Integer status;
+	@ApiModelProperty("机构ID")
+	private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/domain/TopCostTp.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopCostTp.java

@@ -1,13 +1,14 @@
-package com.zhongzheng.modules.financial.domain;
+package com.zhongzheng.modules.top.financial.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 成本模板对象 top_cost_tp

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/domain/TopCostTpItem.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopCostTpItem.java

@@ -1,13 +1,15 @@
-package com.zhongzheng.modules.financial.domain;
+package com.zhongzheng.modules.top.financial.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
 import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 成本模板子项对象 top_cost_tp_item

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/mapper/TopCostTpItemMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopCostTpItemMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.modules.financial.mapper;
+package com.zhongzheng.modules.top.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.financial.domain.TopCostTpItem;
+import com.zhongzheng.modules.top.financial.domain.TopCostTpItem;
 
 /**
  * 成本模板子项Mapper接口

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/mapper/TopCostTpMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopCostTpMapper.java

@@ -1,8 +1,8 @@
-package com.zhongzheng.modules.financial.mapper;
+package com.zhongzheng.modules.top.financial.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.financial.domain.TopCostTp;
+import com.zhongzheng.modules.top.financial.domain.TopCostTp;
 
 /**
  * 成本模板Mapper接口

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/service/ITopCostTpItemService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopCostTpItemService.java

@@ -1,11 +1,11 @@
-package com.zhongzheng.modules.financial.service;
+package com.zhongzheng.modules.top.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemAddBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemEditBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemQueryBo;
-import com.zhongzheng.modules.financial.domain.TopCostTpItem;
-import com.zhongzheng.modules.financial.vo.TopCostTpItemVo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpItemAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpItemEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpItemQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopCostTpItem;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpItemVo;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/service/ITopCostTpService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopCostTpService.java

@@ -1,11 +1,11 @@
-package com.zhongzheng.modules.financial.service;
+package com.zhongzheng.modules.top.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.financial.bo.TopCostTpAddBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpEditBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpQueryBo;
-import com.zhongzheng.modules.financial.domain.TopCostTp;
-import com.zhongzheng.modules.financial.vo.TopCostTpVo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopCostTp;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/service/impl/TopCostTpItemServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopCostTpItemServiceImpl.java

@@ -1,25 +1,24 @@
-package com.zhongzheng.modules.financial.service.impl;
+package com.zhongzheng.modules.top.financial.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemAddBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemEditBo;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemQueryBo;
-import com.zhongzheng.modules.financial.domain.TopCostTpItem;
-import com.zhongzheng.modules.financial.mapper.TopCostTpItemMapper;
-import com.zhongzheng.modules.financial.service.ITopCostTpItemService;
-import com.zhongzheng.modules.financial.vo.TopCostTpItemVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpItemAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpItemEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpItemQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopCostTpItem;
+import com.zhongzheng.modules.top.financial.mapper.TopCostTpItemMapper;
+import com.zhongzheng.modules.top.financial.service.ITopCostTpItemService;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpItemVo;
+import org.springframework.stereotype.Service;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/service/impl/TopCostTpServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopCostTpServiceImpl.java

@@ -1,34 +1,28 @@
-package com.zhongzheng.modules.financial.service.impl;
+package com.zhongzheng.modules.top.financial.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.course.bo.CourseChapterBusinessAddBo;
-import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
-import com.zhongzheng.modules.financial.bo.*;
-import com.zhongzheng.modules.financial.domain.TopCostTp;
-import com.zhongzheng.modules.financial.domain.TopCostTpItem;
-import com.zhongzheng.modules.financial.mapper.TopCostTpMapper;
-import com.zhongzheng.modules.financial.service.ITopCostTpItemService;
-import com.zhongzheng.modules.financial.service.ITopCostTpService;
-import com.zhongzheng.modules.financial.vo.TopCostTpItemVo;
-import com.zhongzheng.modules.financial.vo.TopCostTpVo;
-import com.zhongzheng.modules.grade.domain.ClassGradeUser;
-import com.zhongzheng.modules.sdk.domain.TopNuoMplatformLog;
-import com.zhongzheng.modules.sdk.service.NuonuoService;
+import com.zhongzheng.modules.top.financial.bo.*;
+import com.zhongzheng.modules.top.financial.domain.TopCostTp;
+import com.zhongzheng.modules.top.financial.domain.TopCostTpItem;
+import com.zhongzheng.modules.top.financial.mapper.TopCostTpMapper;
+import com.zhongzheng.modules.top.financial.service.ITopCostTpItemService;
+import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpItemVo;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/vo/TopCostTpItemVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopCostTpItemVo.java

@@ -1,13 +1,11 @@
-package com.zhongzheng.modules.financial.vo;
+package com.zhongzheng.modules.top.financial.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.math.BigDecimal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
+import java.math.BigDecimal;
 
 
 /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/financial/vo/TopCostTpVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopCostTpVo.java

@@ -1,12 +1,10 @@
-package com.zhongzheng.modules.financial.vo;
+package com.zhongzheng.modules.top.financial.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.modules.financial.bo.TopCostTpItemAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
+
 import java.util.List;
 
 
@@ -35,4 +33,6 @@ public class TopCostTpVo {
 	private Integer status;
 	@ApiModelProperty("子项数组")
 	private List<TopCostTpItemVo> itemList;
+	@ApiModelProperty("机构ID")
+	private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopCourseBusinessQueryBo.java

@@ -58,7 +58,7 @@ public class TopCourseBusinessQueryBo extends BaseEntity {
 
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
-	private Integer educationId;
+	private Long educationId;
 
 	@Excel(name = "模板选用")
 	@ApiModelProperty("模板选用")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopCourseEducationTypeQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -48,4 +49,5 @@ public class TopCourseEducationTypeQueryBo extends BaseEntity {
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;
+	private List<Integer> statusList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopCourseEducationType.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.goods.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -44,4 +45,5 @@ private static final long serialVersionUID=1L;
     private Integer sort;
     @TableField(exist = false)
     private Long oId;
+    private String schemeName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopCourseBusinessMapper.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface TopCourseBusinessMapper extends BaseMapper<TopCourseBusiness> {
 
     List<TopCourseBusinessVo> queryList(TopCourseBusinessQueryBo bo);
+
+    List<TopCourseBusinessVo> queryAllList(TopCourseBusinessQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseBusinessService.java

@@ -51,4 +51,6 @@ public interface ITopCourseBusinessService extends IService<TopCourseBusiness> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     TopCourseBusiness getEntityById(Long businessId);
+
+	List<TopCourseBusinessVo> queryAllList(TopCourseBusinessQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseEducationTypeService.java

@@ -29,6 +29,8 @@ public interface ITopCourseEducationTypeService extends IService<TopCourseEducat
 	 */
 	List<TopCourseEducationTypeVo> queryList(TopCourseEducationTypeQueryBo bo);
 
+	List<TopCourseEducationTypeVo> queryAllList(TopCourseEducationTypeQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入教育类型
 	 * @param bo 教育类型新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseBusinessServiceImpl.java

@@ -100,4 +100,9 @@ public class TopCourseBusinessServiceImpl extends ServiceImpl<TopCourseBusinessM
     public TopCourseBusiness getEntityById(Long businessId) {
         return getById(businessId);
     }
+
+    @Override
+    public List<TopCourseBusinessVo> queryAllList(TopCourseBusinessQueryBo bo) {
+        return baseMapper.queryAllList(bo);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseEducationTypeServiceImpl.java

@@ -10,14 +10,17 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.goods.bo.TopCourseBusinessQueryBo;
 import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeAddBo;
 import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeEditBo;
 import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeQueryBo;
 import com.zhongzheng.modules.top.goods.domain.TopCourseEducationTier;
 import com.zhongzheng.modules.top.goods.domain.TopCourseEducationType;
 import com.zhongzheng.modules.top.goods.mapper.TopCourseEducationTypeMapper;
+import com.zhongzheng.modules.top.goods.service.ITopCourseBusinessService;
 import com.zhongzheng.modules.top.goods.service.ITopCourseEducationTierService;
 import com.zhongzheng.modules.top.goods.service.ITopCourseEducationTypeService;
+import com.zhongzheng.modules.top.goods.vo.TopCourseBusinessVo;
 import com.zhongzheng.modules.top.goods.vo.TopCourseEducationTypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +45,9 @@ public class TopCourseEducationTypeServiceImpl extends ServiceImpl<TopCourseEduc
     @Autowired
     private ITopCourseEducationTierService iTopCourseEducationTierService;
 
+    @Autowired
+    private ITopCourseBusinessService iTopCourseBusinessService;
+
     @Override
     public TopCourseEducationTypeVo queryById(Long id){
         TopCourseEducationType db = this.baseMapper.selectById(id);
@@ -54,6 +60,7 @@ public class TopCourseEducationTypeServiceImpl extends ServiceImpl<TopCourseEduc
         lqw.like(StrUtil.isNotBlank(bo.getEducationName()), TopCourseEducationType::getEducationName, bo.getEducationName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), TopCourseEducationType::getEncoder, bo.getEncoder());
         lqw.eq(bo.getStatus() != null, TopCourseEducationType::getStatus, bo.getStatus());
+        lqw.in(bo.getStatusList() != null, TopCourseEducationType::getStatus, bo.getStatusList());
         lqw.eq(bo.getSort() != null, TopCourseEducationType::getSort, bo.getSort());
         List<TopCourseEducationTypeVo> topCourseEducationTypeVos = entity2Vo(this.list(lqw));
         if (CollectionUtils.isEmpty(topCourseEducationTypeVos)){
@@ -70,6 +77,27 @@ public class TopCourseEducationTypeServiceImpl extends ServiceImpl<TopCourseEduc
         return topCourseEducationTypeVos;
     }
 
+    @Override
+    public List<TopCourseEducationTypeVo> queryAllList(TopCourseEducationTypeQueryBo bo) {
+        LambdaQueryWrapper<TopCourseEducationType> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getEducationName()), TopCourseEducationType::getEducationName, bo.getEducationName());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), TopCourseEducationType::getEncoder, bo.getEncoder());
+        lqw.eq(bo.getStatus() != null, TopCourseEducationType::getStatus, bo.getStatus());
+        lqw.in(bo.getStatusList() != null, TopCourseEducationType::getStatus, bo.getStatusList());
+        lqw.eq(bo.getSort() != null, TopCourseEducationType::getSort, bo.getSort());
+        List<TopCourseEducationTypeVo> topCourseEducationTypeVos = entity2Vo(this.list(lqw));
+        if (CollectionUtils.isEmpty(topCourseEducationTypeVos)){
+            return new ArrayList<>();
+        }
+        topCourseEducationTypeVos.forEach(item -> {
+            TopCourseBusinessQueryBo queryBo = new TopCourseBusinessQueryBo();
+            queryBo.setEducationId(item.getId());
+            List<TopCourseBusinessVo> businessVoList = iTopCourseBusinessService.queryAllList(queryBo);
+            item.setBusinessList(businessVoList);
+        });
+        return topCourseEducationTypeVos;
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopCourseEducationTypeVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
 
 
 /**
@@ -44,4 +45,8 @@ public class TopCourseEducationTypeVo {
 	private Integer sort;
 	@ApiModelProperty("")
 	private String tireStatus;
+	@ApiModelProperty("方案名称")
+	private String schemeName;
+	@ApiModelProperty("业务层级列表")
+	private List<TopCourseBusinessVo> businessList;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -56,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             e.education_name,
             e.id as education_id,
             p.project_name,
-            t.name as template_name
+            t.name as template_name,
+            p.id as project_id
         FROM
             course_business b
                 LEFT JOIN course_project_type p on b.project_id =p.id

zhongzheng-system/src/main/resources/mapper/modules/financial/TopCostTpMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/top/TopCostTpMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.financial.mapper.TopCostTpMapper">
+<mapper namespace="com.zhongzheng.modules.top.financial.mapper.TopCostTpMapper">
 
-    <resultMap type="com.zhongzheng.modules.financial.domain.TopCostTp" id="TopCostTpResult">
+    <resultMap type="com.zhongzheng.modules.top.financial.domain.TopCostTp" id="TopCostTpResult">
         <result property="tpId" column="tp_id"/>
         <result property="tpName" column="tp_name"/>
         <result property="status" column="status"/>
@@ -12,5 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="queryList" parameterType="com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo"  resultMap="TopCourseBusinessVoResult">
 
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopCourseBusinessMapper.xml

@@ -28,7 +28,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="aliasName" column="alias_name"/>
     </resultMap>
 
-
+    <select id="queryAllList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="TopCourseBusinessVoResult">
+        SELECT
+        b.id as business_id,
+        b.business_name,
+        b.alias_name,
+        e.education_name,
+        e.id as education_id,
+        p.project_name,
+        p.id as project_id
+        FROM
+        top_course_business b
+        LEFT JOIN top_course_project_type p on b.project_id =p.id
+        LEFT JOIN top_course_education_type e ON p.education_id = e.id
+        where 1=1
+        and p.status = 1
+        and b.status = 1
+        <if test="businessName != null and businessName != ''">
+            AND b.business_name = #{businessName}
+        </if>
+        <if test="encoder != null and encoder != ''">
+            AND b.encoder = #{encoder}
+        </if>
+        <if test="projectId != null and projectId != ''">
+            AND p.id = #{projectId}
+        </if>
+        <if test="educationId != null and educationId != ''">
+            AND e.id = #{educationId}
+        </if>
+        <if test="id != null and id != ''">
+            AND b.id = #{id}
+        </if>
+        order by b.sort
+    </select>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="TopCourseBusinessVoResult">
         SELECT