教育项目业务类型

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

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.vo.CourseBusinessVo;
+
+import java.util.Collection;
 
 /**
  * 业务层次Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CourseBusinessMapper extends BaseMapper<CourseBusiness> {
 
+    Collection<CourseBusinessVo> queryList(CourseBusinessQueryBo bo);
 }

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

@@ -38,12 +38,7 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
 
     @Override
     public List<CourseBusinessVo> queryList(CourseBusinessQueryBo bo) {
-        LambdaQueryWrapper<CourseBusiness> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getBusinessName()), CourseBusiness::getBusinessName, bo.getBusinessName());
-        lqw.eq(StrUtil.isNotBlank(bo.getProjectId()), CourseBusiness::getProjectId, bo.getProjectId());
-        lqw.eq(bo.getSchoolYear() != null, CourseBusiness::getSchoolYear, bo.getSchoolYear());
-        lqw.eq(StrUtil.isNotBlank(bo.getStatus()), CourseBusiness::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**
@@ -52,12 +47,12 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
     * @param collection 实体类集合
     * @return
     */
-    private List<CourseBusinessVo> entity2Vo(Collection<CourseBusiness> collection) {
+    private List<CourseBusinessVo> entity2Vo(Collection<CourseBusinessVo> collection) {
         List<CourseBusinessVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, CourseBusinessVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<CourseBusiness> page = (Page<CourseBusiness>)collection;
+            Page<CourseBusinessVo> page = (Page<CourseBusinessVo>)collection;
             Page<CourseBusinessVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);

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

@@ -48,4 +48,15 @@ public class CourseBusinessVo {
 	/** 编码YW */
 	@ApiModelProperty("编码YW")
 	private String encoder;
+
+	/** 教育类型名称 */
+	@Excel(name = "教育类型名称")
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
+
+
+	/** 项目名称 */
+	@Excel(name = "项目名称")
+	@ApiModelProperty("项目名称")
+	private String projectName;
 }

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

@@ -40,6 +40,10 @@ public class CourseProjectTypeVo {
 	@Excel(name = "教育类型id")
 	@ApiModelProperty("教育类型id")
 	private String educationId;
+	/** 教育类型名称 */
+	@Excel(name = "教育类型名称")
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
 	/** 0 未启用 1启用 */
 	@Excel(name = "0 未启用 1启用")
 	@ApiModelProperty("0 未启用 1启用")

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

@@ -15,5 +15,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseBusinessVo" id="CourseBusinessVoResult">
+        <result property="id" column="id"/>
+        <result property="businessName" column="business_name"/>
+        <result property="remark" column="remark"/>
+        <result property="projectId" column="project_id"/>
+        <result property="schoolYear" column="school_year"/>
+        <result property="status" column="status"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+    </resultMap>
+
+    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseBusinessVoResult">
+        SELECT
+            b.*,
+            e.education_name,
+            p.project_name
+        FROM
+            course_business b
+                LEFT JOIN course_project_type p on b.project_id =p.id
+                LEFT JOIN course_education_type e ON p.education_id = e.id
+    </select>
 
 </mapper>

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

@@ -21,11 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="encoder" column="encoder"/>
         <result property="remark" column="remark"/>
         <result property="educationId" column="education_id"/>
-        <result property="status" column="status"/>
+        <result property="educationName" column="education_name"/>
         <result property="status" column="status"/>
     </resultMap>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseProjectTypeVoResult">
-
+        SELECT
+            p.*,
+            e.education_name
+        FROM
+            course_project_type p
+                LEFT JOIN course_education_type e ON p.education_id = e.id
     </select>
 </mapper>