Ver código fonte

教育项目业务类型

change 4 anos atrás
pai
commit
0ee32a6355

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/SchoolMapper.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.mapper;
 
+import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.domain.School;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,5 +15,5 @@ import java.util.List;
  */
 public interface SchoolMapper extends BaseMapper<School> {
 
-    List<CourseProjectTypeVo> selectProject();
+    List<CourseProjectTypeVo> selectProject(CourseProjectTypeQueryBo courseProjectTypeQueryBo);
 }

+ 5 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolServiceImpl.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.course.bo.CourseProjectTypeQueryBo;
 import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.bo.*;
@@ -75,7 +76,10 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
             voList = pageVo;
         }
         for (SchoolVo schoolVo : voList) {
-            List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject();
+            CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+            courseProjectTypeQueryBo.setId(schoolVo.getId());
+            List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+            schoolVo.setCourseProjectTypes(courseProjectTypeVos);
         }
         return voList;
     }

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

@@ -16,19 +16,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </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="SchoolResult">
+    <select id="selectProject" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseProjectTypeVoResult">
         SELECT
         p.*,
         e.education_name
         FROM
-        course_project_type p
+        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="id != null and id != ''">
-            p.id = #{id}
+            j.school_id = #{id}
         </if>
     </select>
 </mapper>