业务层次

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -45,4 +46,9 @@ public class MajorExamineAddBo {
     /** 入学年份 */
     @ApiModelProperty("入学年份")
     private Integer enrollmentYear;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    @ApiModelProperty("项目id")
+    private Integer projectId;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -54,4 +55,9 @@ public class MajorExamineEditBo {
     @ApiModelProperty("入学年份")
     private Integer enrollmentYear;
 
+    /** 项目id */
+    @Excel(name = "项目id")
+    @ApiModelProperty("项目id")
+    private Integer projectId;
+
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,4 +55,8 @@ public class MajorExamineQueryBo extends BaseEntity {
 	/** 入学年份 */
 	@ApiModelProperty("入学年份")
 	private Integer enrollmentYear;
+	/** 项目id */
+	@Excel(name = "项目id")
+	@ApiModelProperty("项目id")
+	private Integer projectId;
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.course.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -46,4 +47,7 @@ private static final long serialVersionUID=1L;
     private Long endTime;
     /** 入学年份 */
     private Integer enrollmentYear;
+
+    /** 项目id */
+    private Integer projectId;
 }

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

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.zhongzheng.modules.course.bo.MajorExamineQueryBo;
 import com.zhongzheng.modules.course.domain.MajorExamine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.vo.MajorExamineVo;
+
+import java.util.Collection;
 
 /**
  * 考期Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MajorExamineMapper extends BaseMapper<MajorExamine> {
 
+    Collection<MajorExamineVo> queryList(MajorExamineQueryBo bo);
 }

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

@@ -39,14 +39,7 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
 
     @Override
     public List<MajorExamineVo> queryList(MajorExamineQueryBo bo) {
-        LambdaQueryWrapper<MajorExamine> lqw = Wrappers.lambdaQuery();
-        lqw.like(bo.getExamineName() != null, MajorExamine::getExamineName, bo.getExamineName());
-        lqw.eq(bo.getStatus() != null, MajorExamine::getStatus, bo.getStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), MajorExamine::getEncoder, bo.getEncoder());
-        lqw.eq(bo.getStartTime() != null, MajorExamine::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, MajorExamine::getEndTime, bo.getEndTime());
-        lqw.eq(bo.getEnrollmentYear() != null, MajorExamine::getEnrollmentYear, bo.getEnrollmentYear());
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**
@@ -55,12 +48,12 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
     * @param collection 实体类集合
     * @return
     */
-    private List<MajorExamineVo> entity2Vo(Collection<MajorExamine> collection) {
+    private List<MajorExamineVo> entity2Vo(Collection<MajorExamineVo> collection) {
         List<MajorExamineVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, MajorExamineVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<MajorExamine> page = (Page<MajorExamine>)collection;
+            Page<MajorExamineVo> page = (Page<MajorExamineVo>)collection;
             Page<MajorExamineVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);

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

@@ -52,4 +52,24 @@ public class MajorExamineVo {
 	@Excel(name = "入学年份")
 	@ApiModelProperty("入学年份")
 	private Integer enrollmentYear;
+
+	/** 项目id */
+	@Excel(name = "项目id")
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	/** 教育类型名称 */
+	@Excel(name = "教育类型名称")
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
+
+
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Integer educationId;
+
+	/** 项目名称 */
+	@Excel(name = "项目名称")
+	@ApiModelProperty("项目名称")
+	private String projectName;
 }

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

@@ -17,5 +17,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enrollmentYear" column="enrollment_year"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.MajorExamineVo" id="MajorExamineResultVo">
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="examineName" column="examine_name"/>
+        <result property="status" column="status"/>
+        <result property="encoder" column="encoder"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="enrollmentYear" column="enrollment_year"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="educationId" column="education_id"/>
+    </resultMap>
+
+    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="MajorExamineResultVo">
+        SELECT
+        b.*,
+        e.education_name,
+        e.id as education_id,
+        p.project_name
+        FROM
+        major_examine 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
+        where 1=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/MajorMapper.xml

@@ -41,9 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-        <if test="id != null and id != ''">
-            AND j.school_id = #{id}
-        </if>
     </select>
 
 </mapper>