业务层次

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

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

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

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

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

@@ -3,6 +3,9 @@ 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.modules.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.course.vo.MajorProjectVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,6 +19,7 @@ import com.zhongzheng.modules.course.mapper.MajorMapper;
 import com.zhongzheng.modules.course.vo.MajorVo;
 import com.zhongzheng.modules.course.service.IMajorService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -64,6 +68,15 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
             pageVo.addAll(voList);
             voList = pageVo;
         }
+        for (MajorVo majorVo : voList) {
+            CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+            courseProjectTypeQueryBo.setId(majorVo.getId());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            courseProjectTypeQueryBo.setStatus(status);
+            List<MajorProjectVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+            majorVo.setMajorProjectVos(courseProjectTypeVos);
+        }
         return voList;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorVo.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;
 
 
 /**
@@ -48,4 +48,9 @@ public class MajorVo {
 	@Excel(name = "编码ZY")
 	@ApiModelProperty("编码ZY")
 	private String encoder;
+
+	/** 专业项目 */
+	@Excel(name = "专业项目")
+	@ApiModelProperty("专业项目")
+	private List<MajorProjectVo> majorProjectVos;
 }

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

@@ -46,16 +46,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         <if test="businessName != null and businessName != ''">
-            b.business_name = #{businessName}
+            AND b.business_name = #{businessName}
         </if>
         <if test="encoder != null and encoder != ''">
-            b.encoder = #{encoder}
+            AND b.encoder = #{encoder}
         </if>
         <if test="projectId != null and projectId != ''">
-            b.project_id = #{projectId}
+            AND b.project_id = #{projectId}
         </if>
         <if test="educationId != null and educationId != ''">
-            e.education_id = #{educationId}
+            AND e.education_id = #{educationId}
         </if>
     </select>
 

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

@@ -39,13 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         <if test="projectName != null and projectName != ''">
-            p.project_name = #{projectName}
+            AND p.project_name = #{projectName}
         </if>
         <if test="encoder != null and encoder != ''">
-            p.encoder = #{encoder}
+            AND p.encoder = #{encoder}
         </if>
         <if test="educationId != null and educationId != ''">
-            p.education_id = #{educationId}
+            AND p.education_id = #{educationId}
         </if>
     </select>
 </mapper>

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

@@ -16,5 +16,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="encoder" column="encoder"/>
     </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
+        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
+        <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>