业务层次

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

@@ -57,7 +57,7 @@ public class CourseSubjectController extends BaseController {
     /**
      * 导出科目列表
      */
-    @ApiOperation("导出科目列表")
+/*    @ApiOperation("导出科目列表")
     @PreAuthorize("@ss.hasPermi('course:subject:export')")
     @Log(title = "科目", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -65,7 +65,7 @@ public class CourseSubjectController extends BaseController {
         List<CourseSubjectVo> list = iCourseSubjectService.queryList(bo);
         ExcelUtil<CourseSubjectVo> util = new ExcelUtil<CourseSubjectVo>(CourseSubjectVo.class);
         return util.exportExcel(list, "科目");
-    }
+    }*/
 
     /**
      * 获取科目详细信息
@@ -102,11 +102,11 @@ public class CourseSubjectController extends BaseController {
     /**
      * 删除科目
      */
-    @ApiOperation("删除科目")
+/*    @ApiOperation("删除科目")
     @PreAuthorize("@ss.hasPermi('course:subject:remove')")
     @Log(title = "科目" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iCourseSubjectService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
+    }*/
 }

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

@@ -46,7 +46,7 @@ public class MajorController extends BaseController {
      * 查询专业列表
      */
     @ApiOperation("查询专业列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:major:list')")
+    @PreAuthorize("@ss.hasPermi('course:major:list')")
     @GetMapping("/list")
     public TableDataInfo<MajorVo> list(MajorQueryBo bo) {
         startPage();
@@ -58,7 +58,7 @@ public class MajorController extends BaseController {
      * 导出专业列表
      */
  /*   @ApiOperation("导出专业列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:major:export')")
+    @PreAuthorize("@ss.hasPermi('course:major:export')")
     @Log(title = "专业", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<MajorVo> export(MajorQueryBo bo) {
@@ -71,7 +71,7 @@ public class MajorController extends BaseController {
      * 获取专业详细信息
      */
     @ApiOperation("获取专业详细信息")
-    @PreAuthorize("@ss.hasPermi('modules.course:major:query')")
+    @PreAuthorize("@ss.hasPermi('course:major:query')")
     @GetMapping("/{id}")
     public AjaxResult<MajorVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iMajorService.queryById(id));
@@ -81,7 +81,7 @@ public class MajorController extends BaseController {
      * 新增专业
      */
     @ApiOperation("新增专业")
-    @PreAuthorize("@ss.hasPermi('modules.course:major:add')")
+    @PreAuthorize("@ss.hasPermi('course:major:add')")
     @Log(title = "专业", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody MajorAddBo bo) {
@@ -92,7 +92,7 @@ public class MajorController extends BaseController {
      * 修改专业
      */
     @ApiOperation("修改专业")
-    @PreAuthorize("@ss.hasPermi('modules.course:major:edit')")
+    @PreAuthorize("@ss.hasPermi('course:major:edit')")
     @Log(title = "专业", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody MajorEditBo bo) {
@@ -103,7 +103,7 @@ public class MajorController extends BaseController {
      * 删除专业
      */
 /*    @ApiOperation("删除专业")
-    @PreAuthorize("@ss.hasPermi('modules.course:major:remove')")
+    @PreAuthorize("@ss.hasPermi('course:major:remove')")
     @Log(title = "专业" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {

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

@@ -46,7 +46,7 @@ public class MajorExamineController extends BaseController {
      * 查询考期列表
      */
     @ApiOperation("查询考期列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:examine:list')")
+    @PreAuthorize("@ss.hasPermi('course:examine:list')")
     @GetMapping("/list")
     public TableDataInfo<MajorExamineVo> list(MajorExamineQueryBo bo) {
         startPage();
@@ -58,7 +58,7 @@ public class MajorExamineController extends BaseController {
      * 导出考期列表
      */
     @ApiOperation("导出考期列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:examine:export')")
+    @PreAuthorize("@ss.hasPermi('course:examine:export')")
     @Log(title = "考期", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<MajorExamineVo> export(MajorExamineQueryBo bo) {
@@ -71,7 +71,7 @@ public class MajorExamineController extends BaseController {
      * 获取考期详细信息
      */
     @ApiOperation("获取考期详细信息")
-    @PreAuthorize("@ss.hasPermi('modules.course:examine:query')")
+    @PreAuthorize("@ss.hasPermi('course:examine:query')")
     @GetMapping("/{id}")
     public AjaxResult<MajorExamineVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iMajorExamineService.queryById(id));
@@ -81,7 +81,7 @@ public class MajorExamineController extends BaseController {
      * 新增考期
      */
     @ApiOperation("新增考期")
-    @PreAuthorize("@ss.hasPermi('modules.course:examine:add')")
+    @PreAuthorize("@ss.hasPermi('course:examine:add')")
     @Log(title = "考期", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody MajorExamineAddBo bo) {
@@ -92,7 +92,7 @@ public class MajorExamineController extends BaseController {
      * 修改考期
      */
     @ApiOperation("修改考期")
-    @PreAuthorize("@ss.hasPermi('modules.course:examine:edit')")
+    @PreAuthorize("@ss.hasPermi('course:examine:edit')")
     @Log(title = "考期", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody MajorExamineEditBo bo) {
@@ -103,7 +103,7 @@ public class MajorExamineController extends BaseController {
      * 删除考期
      */
     @ApiOperation("删除考期")
-    @PreAuthorize("@ss.hasPermi('modules.course:examine:remove')")
+    @PreAuthorize("@ss.hasPermi('course:examine:remove')")
     @Log(title = "考期" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {

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

@@ -46,7 +46,7 @@ public class MajorLabelController extends BaseController {
      * 查询标签列表
      */
     @ApiOperation("查询标签列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:label:list')")
+    @PreAuthorize("@ss.hasPermi('course:label:list')")
     @GetMapping("/list")
     public TableDataInfo<MajorLabelVo> list(MajorLabelQueryBo bo) {
         startPage();
@@ -57,21 +57,21 @@ public class MajorLabelController extends BaseController {
     /**
      * 导出标签列表
      */
-    @ApiOperation("导出标签列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:label:export')")
+/*    @ApiOperation("导出标签列表")
+    @PreAuthorize("@ss.hasPermi('course:label:export')")
     @Log(title = "标签", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<MajorLabelVo> export(MajorLabelQueryBo bo) {
         List<MajorLabelVo> list = iMajorLabelService.queryList(bo);
         ExcelUtil<MajorLabelVo> util = new ExcelUtil<MajorLabelVo>(MajorLabelVo.class);
         return util.exportExcel(list, "标签");
-    }
+    }*/
 
     /**
      * 获取标签详细信息
      */
     @ApiOperation("获取标签详细信息")
-    @PreAuthorize("@ss.hasPermi('modules.course:label:query')")
+    @PreAuthorize("@ss.hasPermi('course:label:query')")
     @GetMapping("/{id}")
     public AjaxResult<MajorLabelVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iMajorLabelService.queryById(id));
@@ -81,7 +81,7 @@ public class MajorLabelController extends BaseController {
      * 新增标签
      */
     @ApiOperation("新增标签")
-    @PreAuthorize("@ss.hasPermi('modules.course:label:add')")
+    @PreAuthorize("@ss.hasPermi('course:label:add')")
     @Log(title = "标签", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody MajorLabelAddBo bo) {
@@ -92,9 +92,9 @@ public class MajorLabelController extends BaseController {
      * 修改标签
      */
     @ApiOperation("修改标签")
-    @PreAuthorize("@ss.hasPermi('modules.course:label:edit')")
+    @PreAuthorize("@ss.hasPermi('course:label:edit')")
     @Log(title = "标签", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody MajorLabelEditBo bo) {
         return toAjax(iMajorLabelService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -102,11 +102,11 @@ public class MajorLabelController extends BaseController {
     /**
      * 删除标签
      */
-    @ApiOperation("删除标签")
-    @PreAuthorize("@ss.hasPermi('modules.course:label:remove')")
+/*    @ApiOperation("删除标签")
+    @PreAuthorize("@ss.hasPermi('course:label:remove')")
     @Log(title = "标签" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iMajorLabelService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
+    }*/
 }

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

@@ -36,4 +36,8 @@ public class CourseSubjectAddBo {
     /** 科目名称 */
     @ApiModelProperty("科目名称")
     private String subjectName;
+
+    /** 科目名称 */
+    @ApiModelProperty("科目名称")
+    private Long[] courseSubjectProjects;
 }

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

@@ -41,4 +41,8 @@ public class CourseSubjectEditBo {
     @ApiModelProperty("科目名称")
     private String subjectName;
 
+    /** 科目名称 */
+    @ApiModelProperty("科目名称")
+    private Long[] courseSubjectProjects;
+
 }

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

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

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
 import com.zhongzheng.modules.course.domain.CourseSubject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+
+import java.util.List;
 
 /**
  * 科目Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CourseSubjectMapper extends BaseMapper<CourseSubject> {
 
+    List<CourseProjectTypeVo> selectProject(CourseProjectTypeQueryBo courseProjectTypeQueryBo);
 }

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

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.zhongzheng.modules.course.bo.MajorLabelQueryBo;
 import com.zhongzheng.modules.course.domain.MajorLabel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.vo.MajorLabelVo;
+
+import java.util.Collection;
 
 /**
  * 标签Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MajorLabelMapper extends BaseMapper<MajorLabel> {
 
+    Collection<MajorLabelVo> queryList(MajorLabelQueryBo bo);
 }

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

@@ -3,20 +3,27 @@ package com.zhongzheng.modules.course.service.impl;
 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.*;
 import com.zhongzheng.modules.course.domain.CourseEducationType;
+import com.zhongzheng.modules.course.domain.CourseSubjectProject;
+import com.zhongzheng.modules.course.service.ICourseSubjectProjectService;
+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.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;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.course.bo.CourseSubjectAddBo;
-import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
-import com.zhongzheng.modules.course.bo.CourseSubjectEditBo;
 import com.zhongzheng.modules.course.domain.CourseSubject;
 import com.zhongzheng.modules.course.mapper.CourseSubjectMapper;
 import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import com.zhongzheng.modules.course.service.ICourseSubjectService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -31,6 +38,9 @@ import java.util.stream.Collectors;
 @Service
 public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, CourseSubject> implements ICourseSubjectService {
 
+    @Autowired
+    private ICourseSubjectProjectService courseSubjectProjectService;
+
     @Override
     public CourseSubjectVo queryById(Long id){
         CourseSubject db = this.baseMapper.selectById(id);
@@ -63,6 +73,15 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
             pageVo.addAll(voList);
             voList = pageVo;
         }
+        for (CourseSubjectVo courseSubjectVo : voList) {
+            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 voList;
     }
 
@@ -70,9 +89,17 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
     public Boolean insertByAddBo(CourseSubjectAddBo bo) {
         CourseSubject add = BeanUtil.toBean(bo, CourseSubject.class);
         validEntityBeforeSave(add);
+        add.setEncoder(ServletUtils.getEncoded("KM"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean save = this.save(add);
+        for (Long projectId : bo.getCourseSubjectProjects()) {
+            CourseSubjectProjectAddBo courseSubjectProjectAddBo = new CourseSubjectProjectAddBo();
+            courseSubjectProjectAddBo.setProjectId(projectId);
+            courseSubjectProjectAddBo.setSubjectId(add.getId());
+            courseSubjectProjectService.insertByAddBo(courseSubjectProjectAddBo);
+        }
+        return save;
     }
 
     @Override
@@ -80,6 +107,15 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
         CourseSubject update = BeanUtil.toBean(bo, CourseSubject.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        LambdaQueryWrapper<CourseSubjectProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getId()!=null,CourseSubjectProject::getSubjectId, bo.getId());
+        courseSubjectProjectService.remove(lqw);
+        for (Long projectId : bo.getCourseSubjectProjects()) {
+            CourseSubjectProjectAddBo courseSubjectProjectAddBo = new CourseSubjectProjectAddBo();
+            courseSubjectProjectAddBo.setProjectId(projectId);
+            courseSubjectProjectAddBo.setSubjectId(update.getId());
+            courseSubjectProjectService.insertByAddBo(courseSubjectProjectAddBo);
+        }
         return this.updateById(update);
     }
 

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 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 org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -73,6 +74,7 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
         MajorExamine add = BeanUtil.toBean(bo, MajorExamine.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
+        add.setEncoder(ServletUtils.getEncoded("KQ"));
         add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);
     }

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 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 org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -38,11 +39,7 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
 
     @Override
     public List<MajorLabelVo> queryList(MajorLabelQueryBo bo) {
-        LambdaQueryWrapper<MajorLabel> lqw = Wrappers.lambdaQuery();
-        lqw.like(bo.getLabelName() != null, MajorLabel::getLabelName, bo.getLabelName());
-        lqw.eq(bo.getStatus() != null, MajorLabel::getStatus, bo.getStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), MajorLabel::getEncoder, bo.getEncoder());
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**
@@ -51,12 +48,12 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
     * @param collection 实体类集合
     * @return
     */
-    private List<MajorLabelVo> entity2Vo(Collection<MajorLabel> collection) {
+    private List<MajorLabelVo> entity2Vo(Collection<MajorLabelVo> collection) {
         List<MajorLabelVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, MajorLabelVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<MajorLabel> page = (Page<MajorLabel>)collection;
+            Page<MajorLabelVo> page = (Page<MajorLabelVo>)collection;
             Page<MajorLabelVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
@@ -71,6 +68,7 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setEncoder(ServletUtils.getEncoded("BQ"));
         return this.save(add);
     }
 

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 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.*;
 import com.zhongzheng.modules.course.domain.MajorProject;
 import com.zhongzheng.modules.course.service.IMajorProjectService;
@@ -91,6 +92,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setEncoder(ServletUtils.getEncoded("ZY"));
         boolean save = this.save(add);
         for (Long schoolProject : bo.getMajorProjects()) {
             MajorProjectAddBo majorProjectAddBo = new MajorProjectAddBo();

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

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -40,4 +40,9 @@ public class CourseSubjectVo {
 	@Excel(name = "科目名称")
 	@ApiModelProperty("科目名称")
 	private String subjectName;
+
+	/** 备注 */
+	@Excel(name = "绑定项目类型")
+	@ApiModelProperty("绑定项目类型")
+	private List<CourseProjectTypeVo> courseProjectTypes;
 }

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

@@ -40,4 +40,9 @@ public class MajorLabelVo {
 	@Excel(name = "编码BQ")
 	@ApiModelProperty("编码BQ")
 	private String encoder;
+
+	/** 关联专业数目 */
+	@Excel(name = "关联专业数目")
+	@ApiModelProperty("关联专业数目")
+	private Integer num;
 }

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

@@ -14,5 +14,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subjectName" column="subject_name"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseProjectTypeVo" id="CourseProjectTypeVoResult">
+        <result property="id" column="id"/>
+        <result property="projectName" column="project_name"/>
+        <result property="encoder" column="encoder"/>
+        <result property="remark" column="remark"/>
+        <result property="educationId" column="education_id"/>
+        <result property="educationName" column="education_name"/>
+        <result property="status" column="status"/>
+    </resultMap>
 
+    <select id="selectProject" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseProjectTypeVoResult">
+        SELECT
+        p.*,
+        e.education_name
+        FROM
+        course_subject_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
+        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 != ''">
+            AND j.school_id = #{id}
+        </if>
+    </select>
 </mapper>

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

@@ -14,5 +14,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="encoder" column="encoder"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.MajorLabelVo" id="MajorLabelVoResult">
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="labelName" column="label_name"/>
+        <result property="status" column="status"/>
+        <result property="encoder" column="encoder"/>
+        <result property="num" column="num"/>
+    </resultMap>
+
+    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.MajorLabelQueryBo"  resultMap="MajorLabelVoResult">
+        SELECT
+            l.*,
+            (SELECT COUNT( 1 ) FROM major r WHERE l.id = r.label_id ) AS num
+        FROM
+            major_label l
+        where 1=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>
+        <if test="encoder != null and encoder != ''">
+            AND b.encoder = #{encoder}
+        </if>
+        <if test="labelName != null and labelName != ''">
+            AND b.label_name = #{labelName}
+        </if>
 
+    </select>
 </mapper>

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

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