通知列表

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

@@ -45,20 +45,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         Teacher db = this.baseMapper.selectById(teacherId);
         TeacherVo teacherVo = BeanUtil.toBean(db, TeacherVo.class);
         List<TeacherProjectVo> teacherProjectVo = teacherProjectService.queryTeacher(teacherVo.getTeacherId());
-        //要转换的list集合
-        List<Long> testList = new ArrayList();
-        for (TeacherProjectVo projectVo : teacherProjectVo) {
-            testList.add(projectVo.getProjectId());
-        }
-
-        //初始化需要得到的数组
-        Long[] array = new Long[testList.size()];
-
-        //使用for循环得到数组
-        for(int i = 0; i < testList.size();i++){
-            array[i] = testList.get(i);
-        }
-        teacherVo.setTeacherProjectList(array);
+        teacherVo.setTeacherProjectList(teacherProjectVo);
         return teacherVo;
     }
 
@@ -75,20 +62,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         List<TeacherVo> teacherVos = entity2Vo(this.list(lqw));
         for (TeacherVo teacherVo : teacherVos) {
             List<TeacherProjectVo> teacherProjectVo = teacherProjectService.queryTeacher(teacherVo.getTeacherId());
-            //要转换的list集合
-            List<Long> testList = new ArrayList();
-            for (TeacherProjectVo projectVo : teacherProjectVo) {
-                testList.add(projectVo.getProjectId());
-            }
-
-            //初始化需要得到的数组
-            Long[] array = new Long[testList.size()];
 
-            //使用for循环得到数组
-            for(int i = 0; i < testList.size();i++){
-                array[i] = testList.get(i);
-            }
-            teacherVo.setTeacherProjectList(array);
+            teacherVo.setTeacherProjectList(teacherProjectVo);
         }
         return teacherVos;
     }

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

@@ -32,4 +32,18 @@ public class TeacherProjectVo {
 	@Excel(name = "教师ID")
 	@ApiModelProperty("教师ID")
 	private Long teacherId;
+	/** 教育ID */
+	@Excel(name = "教育ID")
+	@ApiModelProperty("教育ID")
+	private Long educationId;
+
+	/** 教育名 */
+	@Excel(name = "教育名")
+	@ApiModelProperty("教育名")
+	private String educationName;
+
+	/** 项目名 */
+	@Excel(name = "项目名")
+	@ApiModelProperty("项目名")
+	private String projectName;
 }

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

@@ -53,9 +53,8 @@ public class TeacherVo {
 	@ApiModelProperty("教师年龄")
 	private Long oldYear;
 
-
-	/** 教師綁定項目 */
-	@ApiModelProperty("教師綁定項目")
-	private Long[] teacherProjectList;
-
+	/** 項目類型 */
+	@Excel(name = "項目類型")
+	@ApiModelProperty("項目類型")
+	private List<TeacherProjectVo> teacherProjectList;
 }

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

@@ -10,13 +10,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="teacherId" column="teacher_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
-
     </resultMap>
     <resultMap type="com.zhongzheng.modules.course.vo.TeacherProjectVo" id="TeacherProjectVo">
         <result property="id" column="id"/>
         <result property="projectId" column="project_id"/>
         <result property="teacherId" column="teacher_id"/>
-
+        <result property="educationId" column="education_id"/>
+        <result property="projectName" column="project_name"/>
+        <result property="educationName" column="education_name"/>
+        <result property="educationId" column="education_id"/>
     </resultMap>
 
 
@@ -24,10 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         p.*,
         t.project_name,
-        t.id as project_id
+        t.id as project_id,
+        e.id as education_id,
+        e.education_name
         FROM
         teacher_project p
         LEFT JOIN course_project_type t on p.project_id=t.id
+        LEFT JOIN course_education_type e on t.education_id = e.id
         WHERE
         1 =1
         <if test="id != null and id!=0 ">