소스 검색

通知列表

change 3 년 전
부모
커밋
3ef0492b99

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

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

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

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

+ 1 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherProjectAddBo.java

@@ -30,7 +30,5 @@ public class TeacherProjectAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
-    /** 教育ID */
-    @ApiModelProperty("教育ID")
-    private Long educationId;
+
 }

+ 1 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/TeacherProject.java

@@ -36,6 +36,5 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-    /** 教育ID */
-    private Long educationId;
+
 }

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

@@ -22,6 +22,7 @@ import com.zhongzheng.modules.course.mapper.TeacherMapper;
 import com.zhongzheng.modules.course.vo.TeacherVo;
 import com.zhongzheng.modules.course.service.ITeacherService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -58,7 +59,20 @@ 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());
-            teacherVo.setTeacherProjectList(teacherProjectVo);
+            //要转换的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);
         }
         return teacherVos;
     }
@@ -91,7 +105,12 @@ 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.getTeacherProjectList()) {
+        for (Long id : bo.getTeacherProjectList()) {
+            TeacherProjectAddBo teacherProjectAddBo = new TeacherProjectAddBo();
+            teacherProjectAddBo.setTeacherId(add.getTeacherId());
+            teacherProjectAddBo.setProjectId(id);
+            teacherProjectAddBo.setCreateTime(DateUtils.getNowTime());
+            teacherProjectAddBo.setUpdateTime(DateUtils.getNowTime());
             teacherProjectService.insertByAddBo(teacherProjectAddBo);
         }
         return save;
@@ -105,7 +124,12 @@ 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.getTeacherProjectList()) {
+        for (Long id : bo.getTeacherProjectList()) {
+            TeacherProjectAddBo teacherProjectAddBo = new TeacherProjectAddBo();
+            teacherProjectAddBo.setTeacherId(update.getTeacherId());
+            teacherProjectAddBo.setProjectId(id);
+            teacherProjectAddBo.setCreateTime(DateUtils.getNowTime());
+            teacherProjectAddBo.setUpdateTime(DateUtils.getNowTime());
             teacherProjectService.insertByAddBo(teacherProjectAddBo);
         }
         return this.updateById(update);

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

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

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

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