商品筛选

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

@@ -37,6 +37,10 @@ public class MajorQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** 分类名称 */
+	@ApiModelProperty("id")
+	private Long id;
+
 	/** 分类名称 */
 	@ApiModelProperty("分类名称")
 	private String categoryName;
@@ -52,4 +56,16 @@ public class MajorQueryBo extends BaseEntity {
 	/** 编码ZY */
 	@ApiModelProperty("编码ZY")
 	private String encoder;
+
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Integer educationId;
+
+	/** 项目id */
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.course.mapper;
 
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.bo.MajorQueryBo;
 import com.zhongzheng.modules.course.domain.Major;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.course.vo.MajorProjectVo;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -17,4 +19,6 @@ import java.util.List;
 public interface MajorMapper extends BaseMapper<Major> {
 
     List<CourseProjectTypeVo> selectProject(CourseProjectTypeQueryBo courseProjectTypeQueryBo);
+
+    Collection<Major> queryList(MajorQueryBo bo);
 }

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

@@ -63,13 +63,8 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
 
     @Override
     public List<MajorVo> queryList(MajorQueryBo bo) {
-        LambdaQueryWrapper<Major> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getCategoryName()), Major::getCategoryName, bo.getCategoryName());
-        lqw.eq(StrUtil.isNotBlank(bo.getMajorReferral()), Major::getMajorReferral, bo.getMajorReferral());
-        lqw.eq(bo.getLabelId() != null, Major::getLabelId, bo.getLabelId());
-        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), Major::getEncoder, bo.getEncoder());
-        lqw.in(bo.getStatus() != null, Major::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
+
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**

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

@@ -56,4 +56,16 @@ public class SchoolQueryBo extends BaseEntity {
 	/** 学校城市 */
 	@ApiModelProperty("学校城市")
 	private Long schoolCityId;
+
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Integer educationId;
+
+	/** 项目id */
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
 }

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

@@ -46,4 +46,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.MajorQueryBo"  resultMap="MajorResult">
+        SELECT
+        m.*
+        FROM
+        major m
+        LEFT JOIN major_project p ON p.major_id = m.id
+        LEFT JOIN course_business b on b.project_id =p.project_id
+        LEFT JOIN course_project_type t on p.project_id=t.id
+        LEFT JOIN course_education_type e on t.education_id = e.id
+        WHERE
+        1 =1
+        <if test="status != null and status.size()!=0 ">
+            AND p.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="id != null and id!=0 ">
+            AND m.id = #{id}
+        </if>
+        <if test="educationId != null and educationId!=0 ">
+            AND e.id = #{educationId}
+        </if>
+        <if test="projectId != null and projectId!=0 ">
+            AND t.id = #{projectId}
+        </if>
+        <if test="businessId != null and businessId!=0 ">
+            AND b.id = #{businessId}
+        </if>
+    </select>
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -73,6 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         school s
         LEFT JOIN apply_areas a ON s.school_city_id=a.area_id
         LEFT JOIN apply_areas v ON s.school_province_id=v.area_id
+        LEFT JOIN school_project p ON p.school_id = s.id
+        LEFT JOIN course_business b on b.project_id =p.project_id
+        LEFT JOIN course_project_type t on p.project_id=t.id
+        LEFT JOIN course_education_type e on t.education_id = e.id
         where 1=1
         <if test="status != null and status.size()!=0 ">
             AND s.status in
@@ -97,6 +101,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="schoolName != null and schoolName != ''">
             and s.school_name like concat('%', #{schoolName}, '%')
         </if>
-
+        <if test="educationId != null and educationId!=0 ">
+            AND e.id = #{educationId}
+        </if>
+        <if test="projectId != null and projectId!=0 ">
+            AND t.id = #{projectId}
+        </if>
+        <if test="businessId != null and businessId!=0 ">
+            AND b.id = #{businessId}
+        </if>
     </select>
 </mapper>