教育类型参数业务

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTierAddBo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 教育层次添加对象 course_education_tier
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+@Data
+@ApiModel("教育层次添加对象")
+public class CourseEducationTierAddBo {
+
+    /** 教育id */
+    @ApiModelProperty("教育id")
+    private Long educationId;
+    /** 1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业 */
+    @ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+    private String tireStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTierEditBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 教育层次编辑对象 course_education_tier
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+@Data
+@ApiModel("教育层次编辑对象")
+public class CourseEducationTierEditBo {
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 教育id */
+    @ApiModelProperty("教育id")
+    private Long educationId;
+
+    /** 1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业 */
+    @ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+    private String tireStatus;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTierQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.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;
+
+/**
+ * 教育层次分页查询对象 course_education_tier
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("教育层次分页查询对象")
+public class CourseEducationTierQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 教育id */
+	@ApiModelProperty("教育id")
+	private Long educationId;
+	/** 1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业 */
+	@ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	private String tireStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTypeAddBo.java

@@ -38,7 +38,7 @@ public class CourseEducationTypeAddBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业 */
-    @ApiModelProperty("1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业")
-    private Integer tierStatus;
+    @Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+    @ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+    private String tireStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTypeEditBo.java

@@ -42,8 +42,8 @@ public class CourseEducationTypeEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业 */
-    @ApiModelProperty("1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业")
-    private Integer tierStatus;
+    @Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+    @ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+    private String tireStatus;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTypeQueryBo.java

@@ -49,7 +49,7 @@ public class CourseEducationTypeQueryBo extends BaseEntity {
 	@ApiModelProperty(" 状态 1正常 0关闭")
 	private List<Integer> status;
 
-	/** 1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业 */
-	@ApiModelProperty("1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业")
-	private Integer tierStatus;
+	@Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	@ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	private String tireStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationTier.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.course.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;
+
+/**
+ * 教育层次对象 course_education_tier
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_education_tier")
+public class CourseEducationTier implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 教育id */
+    private Long educationId;
+    /** 1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业 */
+    private String tireStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationType.java

@@ -41,6 +41,4 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-    /** 1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业 */
-    private Integer tierStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseEducationTierMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.zhongzheng.modules.course.domain.CourseEducationTier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 教育层次Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+public interface CourseEducationTierMapper extends BaseMapper<CourseEducationTier> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseEducationTierService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.zhongzheng.modules.course.domain.CourseEducationTier;
+import com.zhongzheng.modules.course.vo.CourseEducationTierVo;
+import com.zhongzheng.modules.course.bo.CourseEducationTierQueryBo;
+import com.zhongzheng.modules.course.bo.CourseEducationTierAddBo;
+import com.zhongzheng.modules.course.bo.CourseEducationTierEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 教育层次Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+public interface ICourseEducationTierService extends IService<CourseEducationTier> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CourseEducationTierVo queryById(Long educatioId);
+
+	/**
+	 * 查询列表
+	 */
+	List<CourseEducationTierVo> queryList(CourseEducationTierQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入教育层次
+	 * @param bo 教育层次新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CourseEducationTierAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改教育层次
+	 * @param bo 教育层次编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CourseEducationTierEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTierServiceImpl.java

@@ -0,0 +1,96 @@
+package com.zhongzheng.modules.course.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.course.bo.CourseEducationTierAddBo;
+import com.zhongzheng.modules.course.bo.CourseEducationTierQueryBo;
+import com.zhongzheng.modules.course.bo.CourseEducationTierEditBo;
+import com.zhongzheng.modules.course.domain.CourseEducationTier;
+import com.zhongzheng.modules.course.mapper.CourseEducationTierMapper;
+import com.zhongzheng.modules.course.vo.CourseEducationTierVo;
+import com.zhongzheng.modules.course.service.ICourseEducationTierService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 教育层次Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-01
+ */
+@Service
+public class CourseEducationTierServiceImpl extends ServiceImpl<CourseEducationTierMapper, CourseEducationTier> implements ICourseEducationTierService {
+
+    @Override
+    public CourseEducationTierVo queryById(Long educatioId){
+        CourseEducationTier db = this.baseMapper.selectById(educatioId);
+        return BeanUtil.toBean(db, CourseEducationTierVo.class);
+    }
+
+    @Override
+    public List<CourseEducationTierVo> queryList(CourseEducationTierQueryBo bo) {
+        LambdaQueryWrapper<CourseEducationTier> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getTireStatus()), CourseEducationTier::getTireStatus, bo.getTireStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CourseEducationTierVo> entity2Vo(Collection<CourseEducationTier> collection) {
+        List<CourseEducationTierVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseEducationTierVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CourseEducationTier> page = (Page<CourseEducationTier>)collection;
+            Page<CourseEducationTierVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CourseEducationTierAddBo bo) {
+        CourseEducationTier add = BeanUtil.toBean(bo, CourseEducationTier.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CourseEducationTierEditBo bo) {
+        CourseEducationTier update = BeanUtil.toBean(bo, CourseEducationTier.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CourseEducationTier entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTypeServiceImpl.java

@@ -2,9 +2,15 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.base.domain.ApplyAreas;
+import com.zhongzheng.modules.course.bo.CourseEducationTierAddBo;
+import com.zhongzheng.modules.course.domain.CourseEducationTier;
+import com.zhongzheng.modules.course.service.ICourseEducationTierService;
+import com.zhongzheng.modules.course.vo.CourseEducationTierVo;
+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;
@@ -17,6 +23,7 @@ import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.zhongzheng.modules.course.mapper.CourseEducationTypeMapper;
 import com.zhongzheng.modules.course.vo.CourseEducationTypeVo;
 import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
+import org.springframework.util.StringUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -32,6 +39,9 @@ import java.util.stream.Collectors;
 @Service
 public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationTypeMapper, CourseEducationType> implements ICourseEducationTypeService {
 
+    @Autowired
+    private ICourseEducationTierService courseEducationTierService;
+
     @Override
     public CourseEducationTypeVo queryById(Long id){
         CourseEducationType db = this.baseMapper.selectById(id);
@@ -64,6 +74,14 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
             pageVo.addAll(voList);
             voList = pageVo;
         }
+        for (CourseEducationTypeVo courseEducationTypeVo : voList) {
+            LambdaQueryWrapper<CourseEducationTier> lqw = Wrappers.lambdaQuery();
+            lqw.eq(CourseEducationTier::getEducationId,courseEducationTypeVo.getId());
+            List<CourseEducationTier> list = courseEducationTierService.list(lqw);
+            if (!CollectionUtils.isEmpty(list)) {
+                courseEducationTypeVo.setTireStatus(list.get(0).getTireStatus());
+            }
+        }
         return voList;
     }
 
@@ -74,7 +92,12 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
         add.setEncoder(ServletUtils.getEncoded("JY"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean save = this.save(add);
+        CourseEducationTierAddBo courseEducationTierAddBo = new CourseEducationTierAddBo();
+        courseEducationTierAddBo.setTireStatus(bo.getTireStatus());
+        courseEducationTierAddBo.setEducationId(add.getId());
+        Boolean aBoolean = courseEducationTierService.insertByAddBo(courseEducationTierAddBo);
+        return aBoolean;
     }
 
     @Override
@@ -82,6 +105,16 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
         CourseEducationType update = BeanUtil.toBean(bo, CourseEducationType.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+
+        LambdaQueryWrapper<CourseEducationTier> lqw = Wrappers.lambdaQuery();
+        lqw.eq(CourseEducationTier::getEducationId,bo.getId());
+        courseEducationTierService.remove(lqw);
+        if (!StringUtils.isEmpty(bo.getTireStatus())) {
+            CourseEducationTierAddBo courseEducationTierAddBo = new CourseEducationTierAddBo();
+            courseEducationTierAddBo.setTireStatus(bo.getTireStatus());
+            courseEducationTierAddBo.setEducationId(bo.getId());
+            Boolean aBoolean = courseEducationTierService.insertByAddBo(courseEducationTierAddBo);
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseEducationTierVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.course.vo;
+
+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 ruoyi
+ * @date 2021-11-01
+ */
+@Data
+@ApiModel("教育层次视图对象")
+public class CourseEducationTierVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 教育id */
+	@Excel(name = "教育id")
+	@ApiModelProperty("教育id")
+	private Long educationId;
+	/** 1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业 */
+	@Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	@ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	private String tireStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseEducationTypeVo.java

@@ -41,8 +41,7 @@ public class CourseEducationTypeVo {
 	@ApiModelProperty("0 未启用 1启用")
 	private Integer status;
 
-	/** 1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业 */
-	@Excel(name = "1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业")
-	@ApiModelProperty("1 项目类型>业务层次   2项目类型>业务层次>院校  3项目类型>业务层次>院校>专业  4项目类型>业务层次>专业")
-	private Integer tierStatus;
+	@Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	@ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
+	private String tireStatus;
 }

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

@@ -0,0 +1,13 @@
+<?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.course.mapper.CourseEducationTierMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.CourseEducationTier" id="CourseEducationTierResult">
+        <result property="educationId" column="educatio_id"/>
+        <result property="tireStatus" column="tire_status"/>
+    </resultMap>
+
+
+</mapper>