教育类型参数业务

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

@@ -50,10 +50,13 @@ public class CourseSubjectQueryBo extends BaseEntity {
 
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
-	private Integer educationId;
+	private Long educationId;
 
-	/** 项目名称 */
-	@Excel(name = "项目ID")
-	@ApiModelProperty("项目ID")
-	private Integer projectId;
+	/** 项目id */
+	@ApiModelProperty("项目id")
+	private Long projectId;
+
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
 }

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

@@ -59,11 +59,11 @@ public class MajorQueryBo extends BaseEntity {
 
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
-	private Integer educationId;
+	private Long educationId;
 
 	/** 项目id */
 	@ApiModelProperty("项目id")
-	private Integer projectId;
+	private Long projectId;
 
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")

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

@@ -59,11 +59,11 @@ public class SchoolQueryBo extends BaseEntity {
 
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
-	private Integer educationId;
+	private Long educationId;
 
 	/** 项目id */
 	@ApiModelProperty("项目id")
-	private Integer projectId;
+	private Long projectId;
 
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")

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

@@ -78,11 +78,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_subject_project c ON s.id = c.subject_id
         LEFT JOIN course_project_type p ON c.project_id = p.id
         LEFT JOIN course_education_type e ON p.education_id = e.id
-        LEFT JOIN course_business b on b.project_id =p.project_id
+        LEFT JOIN course_business b on b.project_id =p.id
         WHERE
         1 =1
         <if test="status != null and status.size()!=0 ">
-            AND p.status in
+            AND s.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>

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

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         1 =1
         <if test="status != null and status.size()!=0 ">
-            AND p.status in
+            AND m.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>