通知列表

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

@@ -54,18 +54,6 @@ public class TeacherController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 导出名师列表
-     */
-    @ApiOperation("导出名师列表")
-    @PreAuthorize("@ss.hasPermi('system:teacher:export')")
-    @Log(title = "名师", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<TeacherVo> export(TeacherQueryBo bo) {
-        List<TeacherVo> list = iTeacherService.queryList(bo);
-        ExcelUtil<TeacherVo> util = new ExcelUtil<TeacherVo>(TeacherVo.class);
-        return util.exportExcel(list, "名师");
-    }
 
     /**
      * 获取名师详细信息
@@ -94,19 +82,9 @@ public class TeacherController extends BaseController {
     @ApiOperation("修改名师")
     @PreAuthorize("@ss.hasPermi('system:teacher:edit')")
     @Log(title = "名师", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("edit")
     public AjaxResult<Void> edit(@RequestBody TeacherEditBo bo) {
         return toAjax(iTeacherService.updateByEditBo(bo) ? 1 : 0);
     }
 
-    /**
-     * 删除名师
-     */
-    @ApiOperation("删除名师")
-    @PreAuthorize("@ss.hasPermi('system:teacher:remove')")
-    @Log(title = "名师" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{teacherIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] teacherIds) {
-        return toAjax(iTeacherService.deleteWithValidByIds(Arrays.asList(teacherIds), true) ? 1 : 0);
-    }
 }

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -45,4 +45,8 @@ public class TeacherAddBo {
     /** 教师年龄 */
     @ApiModelProperty("教师年龄")
     private Long oldYear;
+
+    /** 教師綁定項目 */
+    @ApiModelProperty("教師綁定項目")
+    private List<TeacherProjectAddBo> teacherProjectAddBo;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -54,4 +55,8 @@ public class TeacherEditBo {
     @ApiModelProperty("教师年龄")
     private Long oldYear;
 
+    /** 教師綁定項目 */
+    @ApiModelProperty("教師綁定項目")
+    private List<TeacherProjectAddBo> teacherProjectAddBo;
+
 }

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

@@ -2,6 +2,9 @@ package com.zhongzheng.modules.course.mapper;
 
 import com.zhongzheng.modules.course.domain.TeacherProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.vo.TeacherProjectVo;
+
+import java.util.List;
 
 /**
  * 教师绑定项目Mapper接口
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TeacherProjectMapper extends BaseMapper<TeacherProject> {
 
+    List<TeacherProjectVo> queryTeacher(Long teacherId);
 }

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

@@ -49,4 +49,6 @@ public interface ITeacherProjectService extends IService<TeacherProject> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TeacherProjectVo> queryTeacher(Long teacherId);
 }

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

@@ -98,4 +98,9 @@ public class TeacherProjectServiceImpl extends ServiceImpl<TeacherProjectMapper,
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<TeacherProjectVo> queryTeacher(Long teacherId) {
+        return baseMapper.queryTeacher(teacherId);
+    }
 }

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

@@ -3,6 +3,12 @@ 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.TeacherProjectAddBo;
+import com.zhongzheng.modules.course.domain.TeacherProject;
+import com.zhongzheng.modules.course.service.ITeacherProjectService;
+import com.zhongzheng.modules.course.vo.TeacherProjectVo;
+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;
@@ -30,6 +36,9 @@ import java.util.stream.Collectors;
 @Service
 public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> implements ITeacherService {
 
+    @Autowired
+    private ITeacherProjectService teacherProjectService;
+
     @Override
     public TeacherVo queryById(Long teacherId){
         Teacher db = this.baseMapper.selectById(teacherId);
@@ -46,7 +55,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), Teacher::getEncoder, bo.getEncoder());
         lqw.eq(bo.getSex() != null, Teacher::getSex, bo.getSex());
         lqw.eq(bo.getOldYear() != null, Teacher::getOldYear, bo.getOldYear());
-        return entity2Vo(this.list(lqw));
+        List<TeacherVo> teacherVos = entity2Vo(this.list(lqw));
+        for (TeacherVo teacherVo : teacherVos) {
+            List<TeacherProjectVo> teacherProjectVo = teacherProjectService.queryTeacher(teacherVo.getTeacherId());
+        }
+        return teacherVos;
     }
 
     /**
@@ -75,7 +88,12 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        add.setEncoder(ServletUtils.getEncoded("MK"));
+        boolean save = this.save(add);
+        for (TeacherProjectAddBo teacherProjectAddBo : bo.getTeacherProjectAddBo()) {
+            teacherProjectService.insertByAddBo(teacherProjectAddBo);
+        }
+        return save;
     }
 
     @Override
@@ -83,6 +101,12 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         Teacher update = BeanUtil.toBean(bo, Teacher.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        LambdaQueryWrapper<TeacherProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TeacherProject::getTeacherId,update.getTeacherId());
+        teacherProjectService.remove(lqw);
+        for (TeacherProjectAddBo teacherProjectAddBo : bo.getTeacherProjectAddBo()) {
+            teacherProjectService.insertByAddBo(teacherProjectAddBo);
+        }
         return this.updateById(update);
     }
 

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

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/TeacherVo.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;
 
 
 /**
@@ -52,4 +52,9 @@ public class TeacherVo {
 	@Excel(name = "教师年龄")
 	@ApiModelProperty("教师年龄")
 	private Long oldYear;
+
+	/** 項目類型 */
+	@Excel(name = "項目類型")
+	@ApiModelProperty("項目類型")
+	private List<TeacherProjectVo> teacherProjectVo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -221,6 +221,9 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
         for (InformVo informVo : informVos) {
             informVo.setInformExamVo(iInformExamService.queryExam(informVo.getInformId()));
             informVo.setInformCourseVo(iInformCourseService.queryCourse(informVo.getInformId()));
+            InformUserQueryBo informUserQueryBo = new InformUserQueryBo();
+            informUserQueryBo.setInformId(informVo.getInformId());
+            informVo.setInformUserVos(iInformUserService.queryUserList(informUserQueryBo));
         }
         return informVos;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformVo.java

@@ -115,6 +115,11 @@ public class InformVo {
 	@ApiModelProperty("绑定课程")
 	private List<InformCourseVo> informCourseVo;
 
+	/** 绑定课程*/
+	@Excel(name = "學員")
+	@ApiModelProperty("學員")
+	private List<InformUserVo> informUserVos;
+
 }
 
 

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

@@ -12,6 +12,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="educationId" column="education_id"/>
     </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"/>
+    </resultMap>
+
 
+    <select id="queryTeacher" parameterType="Long"  resultMap="TeacherProjectVo">
+        SELECT
+        p.*,
+        e.education_name
+        FROM
+        major_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!=0 ">
+            AND j.major_id = #{id}
+        </if>
+        order by j.update_time desc
+    </select>
 
 </mapper>