子父行业类别

zhongzheng-admin/src/main/java/com/zhongzheng/controller/conpany/CompanyController.java

@@ -3,6 +3,9 @@ package com.zhongzheng.controller.conpany;
 import java.io.IOException;
 import java.util.List;
 
+import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
+import com.zhongzheng.modules.company.service.ICompanyTradeService;
+import com.zhongzheng.modules.company.vo.CompanyTradeVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,10 @@ public class CompanyController extends BaseController {
 
     private final ICompanyService iCompanyService;
 
+
+    private final ICompanyTradeService iCompanyTradeService;
+
+
     /**
      * 查询公司管理列列表
      */
@@ -56,6 +63,20 @@ public class CompanyController extends BaseController {
     }
 
 
+
+    /**
+     * 查询行业类别列表
+     */
+    @ApiOperation("查询行业类别列表")
+    @PreAuthorize("@ss.hasPermi('system:trade:list')")
+    @GetMapping("/listTrade")
+    public TableDataInfo<CompanyTradeVo> list(CompanyTradeQueryBo bo) {
+        startPage();
+        List<CompanyTradeVo> list = iCompanyTradeService.queryCompanyTradeVo(bo);
+        return getDataTable(list);
+    }
+
+
     /**
      * 获取公司管理列详细信息
      */

zhongzheng-api/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -24,7 +24,7 @@ import java.util.Map;
 /**
  * 保利威视频信息Controller
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Api(value = "保利威视频信息控制器", tags = {"保利威视频信息管理"})

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/OrderPossessUserController.java

@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 【请填写功能名称】Controller
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-25
  */
 @Api(value = "【用户拥有课程或题库】控制器", tags = {"【用户拥有课程或题库】管理"})

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】添加对象 activity_configuration_use
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 activity_configuration_use
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 activity_configuration_use
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserAddBo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 用户领取记录添加对象 activity_task_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 用户领取记录编辑对象 activity_task_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 用户领取记录分页查询对象 activity_task_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfigurationUse.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 activity_configuration_use
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTaskUser.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 用户领取记录对象 activity_task_user
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationUseMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface ActivityConfigurationUseMapper extends BaseMapper<ActivityConfigurationUse> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskUserMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 用户领取记录Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 public interface ActivityTaskUserMapper extends BaseMapper<ActivityTaskUser> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationUseService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface IActivityConfigurationUseService extends IService<ActivityConfigurationUse> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskUserService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 用户领取记录Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 public interface IActivityTaskUserService extends IService<ActivityTaskUser> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationUseVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskUserVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 用户领取记录视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/bo/CompanyTradeAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.company.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 行业类别添加对象 company_trade
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+@Data
+@ApiModel("行业类别添加对象")
+public class CompanyTradeAddBo {
+
+    /** 行业类别 */
+    @ApiModelProperty("行业类别")
+    private String tradeName;
+    /** 父类 0为顶类  1为子类 以此类推 */
+    @ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+    private Integer father;
+    /** 父类ID */
+    @ApiModelProperty("父类ID")
+    private Long fatherId;
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/bo/CompanyTradeEditBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.company.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 行业类别编辑对象 company_trade
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+@Data
+@ApiModel("行业类别编辑对象")
+public class CompanyTradeEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long tradeId;
+
+    /** 行业类别 */
+    @ApiModelProperty("行业类别")
+    private String tradeName;
+
+    /** 父类 0为顶类  1为子类 以此类推 */
+    @ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+    private Integer father;
+
+    /** 父类ID */
+    @ApiModelProperty("父类ID")
+    private Long fatherId;
+
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/bo/CompanyTradeQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.company.bo;
+
+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;
+
+/**
+ * 行业类别分页查询对象 company_trade
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("行业类别分页查询对象")
+public class CompanyTradeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 行业类别 */
+	@ApiModelProperty("行业类别")
+	private String tradeName;
+	/** 父类 0为顶类  1为子类 以此类推 */
+	@ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+	private Integer father;
+	/** 父类ID */
+	@ApiModelProperty("父类ID")
+	private Long fatherId;
+	/** 商户ID */
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/domain/Company.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 /**
  * 公司管理列对象 company
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-08-12
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/domain/CompanyTrade.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.company.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+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;
+
+/**
+ * 行业类别对象 company_trade
+ * 
+ * @author change
+ * @date 2021-08-16
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("company_trade")
+public class CompanyTrade implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "trade_id")
+    private Long tradeId;
+
+    /** 行业类别 */
+    private String tradeName;
+
+    /** 父类 0为顶类  1为子类 以此类推 */
+    private Integer father;
+
+    /** 父类ID */
+    private Long fatherId;
+
+    /** 商户ID */
+    private Long tenantId;
+
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/mapper/CompanyTradeMapper.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.company.mapper;
+
+import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
+import com.zhongzheng.modules.company.domain.CompanyTrade;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.company.vo.CompanyTradeVo;
+
+import java.util.List;
+
+/**
+ * 行业类别Mapper接口
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+public interface CompanyTradeMapper extends BaseMapper<CompanyTrade> {
+
+    List<CompanyTradeVo> queryCompanyTradeVo(CompanyTradeQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/ICompanyTradeService.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.company.service;
+
+import com.zhongzheng.modules.company.domain.CompanyTrade;
+import com.zhongzheng.modules.company.vo.CompanyTradeVo;
+import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
+import com.zhongzheng.modules.company.bo.CompanyTradeAddBo;
+import com.zhongzheng.modules.company.bo.CompanyTradeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 行业类别Service接口
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+public interface ICompanyTradeService extends IService<CompanyTrade> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CompanyTradeVo queryById(Long tradeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<CompanyTradeVo> queryList(CompanyTradeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入行业类别
+	 * @param bo 行业类别新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CompanyTradeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改行业类别
+	 * @param bo 行业类别编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CompanyTradeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+	/**
+	 * 查询列表
+	 */
+    List<CompanyTradeVo> queryCompanyTradeVo(CompanyTradeQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/impl/CompanyTradeServiceImpl.java

@@ -0,0 +1,108 @@
+package com.zhongzheng.modules.company.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+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 com.zhongzheng.modules.company.bo.CompanyTradeAddBo;
+import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
+import com.zhongzheng.modules.company.bo.CompanyTradeEditBo;
+import com.zhongzheng.modules.company.domain.CompanyTrade;
+import com.zhongzheng.modules.company.mapper.CompanyTradeMapper;
+import com.zhongzheng.modules.company.vo.CompanyTradeVo;
+import com.zhongzheng.modules.company.service.ICompanyTradeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 行业类别Service业务层处理
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+@Service
+public class CompanyTradeServiceImpl extends ServiceImpl<CompanyTradeMapper, CompanyTrade> implements ICompanyTradeService {
+
+    @Override
+    public CompanyTradeVo queryById(Long tradeId){
+        CompanyTrade db = this.baseMapper.selectById(tradeId);
+        return BeanUtil.toBean(db, CompanyTradeVo.class);
+    }
+
+    @Override
+    public List<CompanyTradeVo> queryList(CompanyTradeQueryBo bo) {
+        LambdaQueryWrapper<CompanyTrade> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getTradeName()), CompanyTrade::getTradeName, bo.getTradeName());
+        lqw.eq(bo.getFather() != null, CompanyTrade::getFather, bo.getFather());
+        lqw.eq(bo.getFatherId() != null, CompanyTrade::getFatherId, bo.getFatherId());
+        lqw.eq(bo.getTenantId() != null, CompanyTrade::getTenantId, bo.getTenantId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CompanyTradeVo> entity2Vo(Collection<CompanyTrade> collection) {
+        List<CompanyTradeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CompanyTradeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CompanyTrade> page = (Page<CompanyTrade>)collection;
+            Page<CompanyTradeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CompanyTradeAddBo bo) {
+        CompanyTrade add = BeanUtil.toBean(bo, CompanyTrade.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CompanyTradeEditBo bo) {
+        CompanyTrade update = BeanUtil.toBean(bo, CompanyTrade.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CompanyTrade entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<CompanyTradeVo> queryCompanyTradeVo(CompanyTradeQueryBo bo) {
+        List<CompanyTradeVo> companyTradeVos = baseMapper.queryCompanyTradeVo(bo);
+        return companyTradeVos;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/vo/CompanyTradeSonVo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.company.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 行业类别视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+@Data
+@ApiModel("行业类别视图对象")
+public class CompanyTradeSonVo {
+    private static final long serialVersionUID = 1L;
+
+    /** $pkColumn.columnComment */
+    @ApiModelProperty("$pkColumn.columnComment")
+    private Long tradeId;
+
+    /** 行业类别 */
+    @Excel(name = "行业类别")
+    @ApiModelProperty("行业类别")
+    private String tradeName;
+    /** 父类 0为顶类  1为子类 以此类推 */
+    @Excel(name = "父类 0为顶类  1为子类 以此类推")
+    @ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+    private Integer father;
+    /** 父类ID */
+    @Excel(name = "父类ID")
+    @ApiModelProperty("父类ID")
+    private Long fatherId;
+    /** 商户ID */
+    @Excel(name = "商户ID")
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/vo/CompanyTradeVo.java

@@ -0,0 +1,59 @@
+package com.zhongzheng.modules.company.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 行业类别视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-08-16
+ */
+@Data
+@ApiModel("行业类别视图对象")
+public class CompanyTradeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long tradeId;
+
+	/** 行业类别 */
+	@Excel(name = "行业类别")
+	@ApiModelProperty("行业类别")
+	private String tradeName;
+	/** 父类 0为顶类  1为子类 以此类推 */
+	@Excel(name = "父类 0为顶类  1为子类 以此类推")
+	@ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+	private Integer father;
+	/** 父类ID */
+	@Excel(name = "父类ID")
+	@ApiModelProperty("父类ID")
+	private Long fatherId;
+	/** 商户ID */
+	@Excel(name = "商户ID")
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+
+	@Excel(name = "子行业类别")
+	@ApiModelProperty("子行业类别")
+	private List<CompanyTradeSonVo> companyTradeSonVo;
+
+
+	/** 创建时间 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long createTime;
+
+	/** 修改时间 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementGuideEditBo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 exam_arrangement_guide
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementGuideQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 exam_arrangement_guide
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】添加对象 exam_arrangement_sub
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 exam_arrangement_sub
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangementGuide.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 exam_arrangement_guide
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangementSub.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 exam_arrangement_sub
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementGuideMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 public interface ExamArrangementGuideMapper extends BaseMapper<ExamArrangementGuide> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementSubMapper.java

@@ -6,7 +6,7 @@ import com.zhongzheng.modules.exam.domain.ExamArrangementSub;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 public interface ExamArrangementSubMapper extends BaseMapper<ExamArrangementSub> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementGuideServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementSubServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamArrangementGuideVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamArrangementSubVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponAddBo.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 【请填写功能名称】添加对象 coupon
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponEditBo.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 /**
  * 【请填写功能名称】编辑对象 coupon
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 coupon
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Coupon.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 coupon
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/CouponMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface CouponMapper extends BaseMapper<Coupon> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/ICouponService.java

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface ICouponService extends IService<Coupon> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CouponVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 保利威视频信息添加对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 保利威视频信息编辑对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 保利威视频信息分页查询对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/domain/PolyvVideDo.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 保利威视频信息对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java

@@ -40,7 +40,7 @@ import static com.squareup.okhttp.internal.Util.md5Hex;
 /**
  * 保利威视频信息Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/vo/PolyvVideoQuerVo.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 保利威视频信息视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/vo/PolyvVideoVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 保利威视频信息视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 order_possess_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-30
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 order_possess_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-30
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】添加对象 user_plan
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanCourceAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】添加对象 user_plan_cource
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanCourceEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 user_plan_cource
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanCourceQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 user_plan_cource
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 user_plan
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 user_plan
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSchoolInfoQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 用户学校信息分页查询对象 user_school_info
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserPlan.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 user_plan
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserPlanCource.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 user_plan_cource
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/OrderPossessUserMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 public interface OrderPossessUserMapper extends BaseMapper<OrderPossessUser> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserPlanCourceService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 public interface IUserPlanCourceService extends IService<UserPlanCource> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-24
  */
 @Service

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyTradeMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.company.mapper.CompanyTradeMapper">
+
+    <resultMap type="com.zhongzheng.modules.company.domain.CompanyTrade" id="CompanyTradeResult">
+        <result property="tradeId" column="trade_id"/>
+        <result property="tradeName" column="trade_name"/>
+        <result property="father" column="father"/>
+        <result property="fatherId" column="father_id"/>
+        <result property="tenantId" column="tenant_id"/>
+    </resultMap>
+
+
+    <resultMap type="com.zhongzheng.modules.company.vo.CompanyTradeVo" id="CompanyTradeResultVo">
+        <result property="tradeId" column="trade_id"/>
+        <result property="tradeName" column="trade_name"/>
+        <result property="father" column="father"/>
+        <result property="fatherId" column="father_id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <collection property="companyTradeSonVo" javaType="java.util.List" resultMap="CompanyTradeResultSonVo"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.company.vo.CompanyTradeSonVo" id="CompanyTradeResultSonVo">
+        <result property="tradeId" column="son_id"/>
+        <result property="tradeName" column="son_name"/>
+        <result property="tenantId" column="son_tenant_id"/>
+    </resultMap>
+
+    <select id="queryCompanyTradeVo" parameterType="com.zhongzheng.modules.company.bo.CompanyTradeQueryBo" resultMap="CompanyTradeResultVo">
+        SELECT
+            c.trade_id,
+            c.trade_name,
+            m.trade_id AS son_id,
+            m.trade_name AS son_name,
+            m.tenant_id AS son_tenant_id
+        FROM
+                ( SELECT * FROM company_trade WHERE father = 0 ) c
+                    LEFT JOIN ( SELECT * FROM company_trade WHERE father = 1 ) m ON c.trade_id = m.father_id
+    </select>
+
+
+</mapper>