add 课程模块

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,7 +48,7 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	/** 学年 */
 	@ApiModelProperty("学年")
 	private Long schoolYear;
-	/** 0 未启用 1启用 */
-	@ApiModelProperty("0 未启用 1启用")
-	private Integer status;
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private List<Integer> status;
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -42,7 +43,8 @@ public class CourseEducationTypeQueryBo extends BaseEntity {
 	/** 编码JY */
 	@ApiModelProperty("编码JY")
 	private String encoder;
-	/** 0 未启用 1启用 */
-	@ApiModelProperty("0 未启用 1启用")
-	private Integer status;
+
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private List<Integer> status;
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -48,7 +49,7 @@ public class CourseProjectTypeQueryBo extends BaseEntity {
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
 	private String educationId;
-	/** 0 未启用 1启用 */
-	@ApiModelProperty("0 未启用 1启用")
-	private String status;
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private List<Integer> status;
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -39,9 +40,9 @@ public class CourseSubjectQueryBo extends BaseEntity {
 	/** 编码KM */
 	@ApiModelProperty("编码KM")
 	private String encoder;
-	/** 0 未启用 1启用 -1删除 */
-	@ApiModelProperty("0 未启用 1启用 -1删除")
-	private Integer status;
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private List<Integer> status;
 	/** 科目名称 */
 	@ApiModelProperty("科目名称")
 	private String subjectName;

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.base.domain.ApplyAreas;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -43,6 +44,7 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
         lqw.like(StrUtil.isNotBlank(bo.getEducationName()), CourseEducationType::getEducationName, bo.getEducationName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), CourseEducationType::getEncoder, bo.getEncoder());
         lqw.eq(bo.getStatus()!=null, CourseEducationType::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, CourseEducationType::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -21,6 +21,7 @@ import com.zhongzheng.modules.user.mapper.SchoolMapper;
 import com.zhongzheng.modules.user.vo.SchoolVo;
 import com.zhongzheng.modules.user.service.ISchoolService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -78,6 +79,9 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         for (SchoolVo schoolVo : voList) {
             CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
             courseProjectTypeQueryBo.setId(schoolVo.getId());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            courseProjectTypeQueryBo.setStatus(status);
             List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
             schoolVo.setCourseProjectTypes(courseProjectTypeVos);
         }

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

@@ -35,7 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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
-        and b.status != -1
+        and p.status != -1
+        and e.status != -1
+        <if test="status != null and status.size()!=0 ">
+            AND b.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
 </mapper>

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

@@ -32,8 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             course_project_type p
                 LEFT JOIN course_education_type e ON p.education_id = e.id
-        <if test="status != null and status != ''">
-                and p.status = #{status}
+        <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 != ''">
             p.id = #{id}

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

@@ -35,7 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         school_project j
         LEFT JOIN course_project_type p on p.id=j.project_id
         LEFT JOIN course_education_type e ON p.education_id = e.id
-        and p.status != -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 != ''">
             j.school_id = #{id}
         </if>