章模块

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorExamineController.java

@@ -57,7 +57,7 @@ public class MajorExamineController extends BaseController {
     /**
      * 导出考期列表
      */
-    @ApiOperation("导出考期列表")
+/*    @ApiOperation("导出考期列表")
     @PreAuthorize("@ss.hasPermi('course:examine:export')")
     @Log(title = "考期", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -65,7 +65,7 @@ public class MajorExamineController extends BaseController {
         List<MajorExamineVo> list = iMajorExamineService.queryList(bo);
         ExcelUtil<MajorExamineVo> util = new ExcelUtil<MajorExamineVo>(MajorExamineVo.class);
         return util.exportExcel(list, "考期");
-    }
+    }*/
 
     /**
      * 获取考期详细信息
@@ -94,7 +94,7 @@ public class MajorExamineController extends BaseController {
     @ApiOperation("修改考期")
     @PreAuthorize("@ss.hasPermi('course:examine:edit')")
     @Log(title = "考期", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody MajorExamineEditBo bo) {
         return toAjax(iMajorExamineService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -102,11 +102,11 @@ public class MajorExamineController extends BaseController {
     /**
      * 删除考期
      */
-    @ApiOperation("删除考期")
+ /*   @ApiOperation("删除考期")
     @PreAuthorize("@ss.hasPermi('course:examine:remove')")
     @Log(title = "考期" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iMajorExamineService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
+    }*/
 }

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

@@ -39,6 +39,10 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	@ApiModelProperty("编码YW")
 	private String encoder;
 
+	/** 业务ID */
+	@ApiModelProperty("业务ID")
+	private Long id;
+
 	/** 项目名称 */
 	@ApiModelProperty("项目名称")
 	private String businessName;

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;
@@ -29,7 +30,7 @@ public class MajorExamineAddBo {
     private Long updateTime;
     /** 考期名字 */
     @ApiModelProperty("考期名字")
-    private Long examineName;
+    private String examineName;
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")
     private Integer status;
@@ -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;
@@ -32,7 +33,7 @@ public class MajorExamineEditBo {
 
     /** 考期名字 */
     @ApiModelProperty("考期名字")
-    private Long examineName;
+    private String examineName;
 
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")
@@ -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;
@@ -36,9 +37,13 @@ public class MajorExamineQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** id */
+	@ApiModelProperty("id")
+	private Long id;
+
 	/** 考期名字 */
 	@ApiModelProperty("考期名字")
-	private Long examineName;
+	private String examineName;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
 	private Integer status;
@@ -54,4 +59,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/bo/MajorLabelAddBo.java

@@ -29,7 +29,7 @@ public class MajorLabelAddBo {
     private Long updateTime;
     /** 标签名字 */
     @ApiModelProperty("标签名字")
-    private Long labelName;
+    private String labelName;
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")
     private Integer status;

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

@@ -32,7 +32,7 @@ public class MajorLabelEditBo {
 
     /** 标签名字 */
     @ApiModelProperty("标签名字")
-    private Long labelName;
+    private String labelName;
 
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")

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

@@ -39,7 +39,7 @@ public class MajorLabelQueryBo extends BaseEntity {
 
 	/** 标签名字 */
 	@ApiModelProperty("标签名字")
-	private Long labelName;
+	private String labelName;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
 	private List<Integer> status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorQueryBo.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 MajorQueryBo extends BaseEntity {
 	private Long labelId;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 编码ZY */
 	@ApiModelProperty("编码ZY")
 	private String encoder;

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;
@@ -35,7 +36,7 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     /** 考期名字 */
-    private Long examineName;
+    private String examineName;
     /** 1正常 0关闭 */
     private Integer status;
     /** 编码KQ */
@@ -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/domain/MajorLabel.java

@@ -35,7 +35,7 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     /** 标签名字 */
-    private Long labelName;
+    private String labelName;
     /** 1正常 0关闭 */
     private Integer status;
     /** 编码BQ */

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/CourseBusinessServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.mapper.CourseBusinessMapper;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
 import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -33,8 +34,13 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
 
     @Override
     public CourseBusinessVo queryById(Long id){
-        CourseBusiness db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, CourseBusinessVo.class);
+        CourseBusinessQueryBo courseBusinessQueryBo = new CourseBusinessQueryBo();
+        courseBusinessQueryBo.setId(id);
+        List<CourseBusinessVo> courseBusinessVos = entity2Vo(baseMapper.queryList(courseBusinessQueryBo));
+        if (CollectionUtils.isEmpty(courseBusinessVos)){
+            throw new IllegalArgumentException("请输入正确业务ID");
+        }
+        return BeanUtil.toBean(courseBusinessVos.get(0), CourseBusinessVo.class);
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.course.domain.CourseProjectType;
 import com.zhongzheng.modules.course.mapper.CourseProjectTypeMapper;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -33,8 +34,13 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
 
     @Override
     public CourseProjectTypeVo queryById(Long id){
-        CourseProjectType db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, CourseProjectTypeVo.class);
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(id);
+        List<CourseProjectTypeVo> courseProjectTypeVos = entity2Vo(baseMapper.queryList(courseProjectTypeQueryBo));
+        if (CollectionUtils.isEmpty(courseProjectTypeVos)){
+            throw new IllegalArgumentException("请输入正确业务ID");
+        }
+        return BeanUtil.toBean(courseProjectTypeVos.get(0), CourseProjectTypeVo.class);
     }
 
     @Override

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

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
 import com.zhongzheng.modules.user.domain.SchoolProject;
 import com.zhongzheng.modules.user.vo.SchoolVo;
+import org.apache.commons.math3.distribution.AbstractMultivariateRealDistribution;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -44,7 +45,15 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
     @Override
     public CourseSubjectVo queryById(Long id){
         CourseSubject db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, CourseSubjectVo.class);
+        CourseSubjectVo courseSubjectVo = BeanUtil.toBean(db, CourseSubjectVo.class);
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(courseSubjectVo.getId());
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        courseProjectTypeQueryBo.setStatus(status);
+        List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+        courseSubjectVo.setCourseProjectTypes(courseProjectTypeVos);
+        return courseSubjectVo;
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.course.domain.MajorExamine;
 import com.zhongzheng.modules.course.mapper.MajorExamineMapper;
 import com.zhongzheng.modules.course.vo.MajorExamineVo;
 import com.zhongzheng.modules.course.service.IMajorExamineService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -33,20 +34,18 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
 
     @Override
     public MajorExamineVo queryById(Long id){
-        MajorExamine db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, MajorExamineVo.class);
+        MajorExamineQueryBo majorExamineQueryBo = new MajorExamineQueryBo();
+        majorExamineQueryBo.setId(id);
+        List<MajorExamineVo> majorExamineVos = entity2Vo(baseMapper.queryList(majorExamineQueryBo));
+        if (CollectionUtils.isEmpty(majorExamineVos)){
+            throw new IllegalArgumentException("请输入正确的ID");
+        }
+        return BeanUtil.toBean(majorExamineVos.get(0), MajorExamineVo.class);
     }
 
     @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 +54,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/service/impl/MajorLabelServiceImpl.java

@@ -4,6 +4,13 @@ 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.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.mapper.MajorMapper;
+import com.zhongzheng.modules.course.service.IMajorService;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.course.vo.MajorVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -17,6 +24,7 @@ import com.zhongzheng.modules.course.mapper.MajorLabelMapper;
 import com.zhongzheng.modules.course.vo.MajorLabelVo;
 import com.zhongzheng.modules.course.service.IMajorLabelService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -31,10 +39,20 @@ import java.util.stream.Collectors;
 @Service
 public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLabel> implements IMajorLabelService {
 
+    @Autowired
+    private IMajorService majorService;
+
+
+
     @Override
     public MajorLabelVo queryById(Long id){
         MajorLabel db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, MajorLabelVo.class);
+        MajorLabelVo majorLabelVo = BeanUtil.toBean(db, MajorLabelVo.class);
+        LambdaQueryWrapper<Major> lqw = Wrappers.lambdaQuery();
+        lqw.eq( Major::getLabelId, majorLabelVo.getId());
+        List<Major> list = majorService.list(lqw);
+        majorLabelVo.setMajorVos(entityMajorVo(list));
+        return majorLabelVo;
     }
 
     @Override
@@ -42,6 +60,20 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
         return entity2Vo(baseMapper.queryList(bo));
     }
 
+    private List<MajorVo> entityMajorVo(Collection<Major> collection) {
+        List<MajorVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Major> page = (Page<Major>)collection;
+            Page<MajorVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.*;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.zhongzheng.modules.course.domain.MajorProject;
 import com.zhongzheng.modules.course.service.IMajorProjectService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
@@ -43,7 +44,15 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     @Override
     public MajorVo queryById(Long id){
         Major db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, MajorVo.class);
+        MajorVo majorVo = BeanUtil.toBean(db, MajorVo.class);
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(majorVo.getId());
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        courseProjectTypeQueryBo.setStatus(status);
+        List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+        majorVo.setCourseProjectTypeVo(courseProjectTypeVos);
+        return majorVo;
     }
 
     @Override
@@ -52,8 +61,8 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         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(bo.getStatus() != null, Major::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), Major::getEncoder, bo.getEncoder());
+        lqw.in(bo.getStatus() != null, Major::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -31,7 +31,7 @@ public class MajorExamineVo {
 	/** 考期名字 */
 	@Excel(name = "考期名字")
 	@ApiModelProperty("考期名字")
-	private Long examineName;
+	private String examineName;
 	/** 1正常 0关闭 */
 	@Excel(name = "1正常 0关闭")
 	@ApiModelProperty("1正常 0关闭")
@@ -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/java/com/zhongzheng/modules/course/vo/MajorLabelVo.java

@@ -2,11 +2,12 @@ package com.zhongzheng.modules.course.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.course.domain.Major;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -31,7 +32,7 @@ public class MajorLabelVo {
 	/** 标签名字 */
 	@Excel(name = "标签名字")
 	@ApiModelProperty("标签名字")
-	private Long labelName;
+	private String labelName;
 	/** 1正常 0关闭 */
 	@Excel(name = "1正常 0关闭")
 	@ApiModelProperty("1正常 0关闭")
@@ -45,4 +46,9 @@ public class MajorLabelVo {
 	@Excel(name = "关联专业数目")
 	@ApiModelProperty("关联专业数目")
 	private Integer num;
+
+	/** 关联专业数目 */
+	@Excel(name = "专业")
+	@ApiModelProperty("专业")
+	private List<MajorVo> majorVos;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolQueryBo.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;
 
@@ -44,7 +45,7 @@ public class SchoolQueryBo extends BaseEntity {
 	private String encoder;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 学校省份 */
 	@ApiModelProperty("学校省份")
 	private String schoolProvince;

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.bo.*;
@@ -45,7 +46,16 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     @Override
     public SchoolVo queryById(Long id){
         School db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, SchoolVo.class);
+        SchoolVo schoolVo = BeanUtil.toBean(db, SchoolVo.class);
+
+        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);
+        return schoolVo;
     }
 
     @Override
@@ -53,9 +63,9 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         LambdaQueryWrapper<School> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getSchoolName()), School::getSchoolName, bo.getSchoolName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), School::getEncoder, bo.getEncoder());
-        lqw.eq(bo.getStatus() != null, School::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getSchoolProvince()), School::getSchoolProvince, bo.getSchoolProvince());
         lqw.eq(StrUtil.isNotBlank(bo.getSchoolCity()), School::getSchoolCity, bo.getSchoolCity());
+        lqw.in(bo.getStatus() != null, School::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -48,5 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="educationId != null and educationId != ''">
             AND p.education_id = #{educationId}
         </if>
+        <if test="id != null and id != ''">
+            AND p.id = #{id}
+        </if>
     </select>
 </mapper>

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

@@ -39,8 +39,5 @@ 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>

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>