通知列表

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

@@ -48,5 +48,5 @@ public class TeacherAddBo {
 
     /** 教師綁定項目 */
     @ApiModelProperty("教師綁定項目")
-    private List<TeacherProjectAddBo> teacherProjectAddBo;
+    private List<TeacherProjectAddBo> teacherProjectList;
 }

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

@@ -57,6 +57,6 @@ public class TeacherEditBo {
 
     /** 教師綁定項目 */
     @ApiModelProperty("教師綁定項目")
-    private List<TeacherProjectAddBo> teacherProjectAddBo;
+    private List<TeacherProjectAddBo> teacherProjectList;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherQueryBo.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;
 
@@ -47,7 +48,7 @@ public class TeacherQueryBo extends BaseEntity {
 	private String avatar;
 	/** 状态 0关闭 1开启 */
 	@ApiModelProperty("状态 0关闭 1开启")
-	private Integer status;
+	private List<Integer> status;
 	/** 编码MK */
 	@ApiModelProperty("编码MK")
 	private String encoder;

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

@@ -51,13 +51,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         lqw.like(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
         lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), Teacher::getIntroduce, bo.getIntroduce());
         lqw.eq(StrUtil.isNotBlank(bo.getAvatar()), Teacher::getAvatar, bo.getAvatar());
-        lqw.eq(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
         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());
         List<TeacherVo> teacherVos = entity2Vo(this.list(lqw));
         for (TeacherVo teacherVo : teacherVos) {
             List<TeacherProjectVo> teacherProjectVo = teacherProjectService.queryTeacher(teacherVo.getTeacherId());
+            teacherVo.setTeacherProjectList(teacherProjectVo);
         }
         return teacherVos;
     }
@@ -90,7 +91,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         add.setUpdateTime(DateUtils.getNowTime());
         add.setEncoder(ServletUtils.getEncoded("MK"));
         boolean save = this.save(add);
-        for (TeacherProjectAddBo teacherProjectAddBo : bo.getTeacherProjectAddBo()) {
+        for (TeacherProjectAddBo teacherProjectAddBo : bo.getTeacherProjectList()) {
             teacherProjectService.insertByAddBo(teacherProjectAddBo);
         }
         return save;
@@ -104,7 +105,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         LambdaQueryWrapper<TeacherProject> lqw = Wrappers.lambdaQuery();
         lqw.eq(TeacherProject::getTeacherId,update.getTeacherId());
         teacherProjectService.remove(lqw);
-        for (TeacherProjectAddBo teacherProjectAddBo : bo.getTeacherProjectAddBo()) {
+        for (TeacherProjectAddBo teacherProjectAddBo : bo.getTeacherProjectList()) {
             teacherProjectService.insertByAddBo(teacherProjectAddBo);
         }
         return this.updateById(update);

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

@@ -56,5 +56,5 @@ public class TeacherVo {
 	/** 項目類型 */
 	@Excel(name = "項目類型")
 	@ApiModelProperty("項目類型")
-	private List<TeacherProjectVo> teacherProjectVo;
+	private List<TeacherProjectVo> teacherProjectList;
 }