From 8ccb6d0a2fae0816823af0e8d558e22a3095aaa1 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 14 Dec 2022 18:59:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=99=E6=8E=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/teacher/service/impl/TeacherServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java index 0b596640..e27484bd 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java @@ -206,7 +206,8 @@ public class TeacherServiceImpl implements ITeacherService { @Override public void updateTeacher(Teacher entity) { - dao.update(entity); + Teacher teacher = dao.get(entity.getId()); + dao.update(teacher); } @Override From e1644c1816dc1d2e981bf6cebcb4f9843abc0144 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 14 Dec 2022 19:02:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=99=E6=8E=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/teacher/service/impl/TeacherServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java index e27484bd..09c114be 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java @@ -205,6 +205,7 @@ public class TeacherServiceImpl implements ITeacherService { } @Override + @Transactional public void updateTeacher(Teacher entity) { Teacher teacher = dao.get(entity.getId()); dao.update(teacher); From 5690ba67b460126dd0954ec24bb2039080a7a720 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 14 Dec 2022 19:12:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=99=E6=8E=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/teacher/api/TeacherApi.java | 3 ++- .../module/teacher/dto/TeacherFiledVo.java | 18 ++++++++++++++++++ .../teacher/service/ITeacherService.java | 3 ++- .../service/impl/TeacherServiceImpl.java | 7 ++++++- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/teacher/dto/TeacherFiledVo.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/api/TeacherApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/api/TeacherApi.java index b90a99f7..dd2e3bf5 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/api/TeacherApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/api/TeacherApi.java @@ -11,6 +11,7 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import com.xboe.module.teacher.dto.TeacherFiledVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -280,7 +281,7 @@ public class TeacherApi extends ApiBaseController { * @return */ @PostMapping("/update-teacher") - public JsonResponse updateTeacher(@RequestBody Teacher teacher) { + public JsonResponse updateTeacher(@RequestBody TeacherFiledVo teacher) { if (teacher == null) { return error("缺少必要参数"); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/dto/TeacherFiledVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/dto/TeacherFiledVo.java new file mode 100644 index 00000000..ea134b20 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/dto/TeacherFiledVo.java @@ -0,0 +1,18 @@ +package com.xboe.module.teacher.dto; + +import lombok.Data; + +@Data +public class TeacherFiledVo { + + private String id; + + private String photo; + + private String workExperience; + + private String courses; + + private String expertise; + +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/ITeacherService.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/ITeacherService.java index 9dffdf3c..78a1a5ee 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/ITeacherService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/ITeacherService.java @@ -4,6 +4,7 @@ import java.util.List; import com.xboe.common.PageList; import com.xboe.core.exception.XaskException; +import com.xboe.module.teacher.dto.TeacherFiledVo; import com.xboe.module.teacher.dto.TeacherSyncUpdateDto; import com.xboe.module.teacher.entity.Teacher; import com.xboe.module.teacher.vo.TeacherQuery; @@ -67,7 +68,7 @@ public interface ITeacherService { * @param entity * @throws XaskException */ - void updateTeacher(Teacher entity); + void updateTeacher(TeacherFiledVo entity); /* * 更新同步信息 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java index 09c114be..c95adef9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java @@ -9,6 +9,7 @@ import java.util.List; import javax.annotation.Resource; +import com.xboe.module.teacher.dto.TeacherFiledVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -206,8 +207,12 @@ public class TeacherServiceImpl implements ITeacherService { @Override @Transactional - public void updateTeacher(Teacher entity) { + public void updateTeacher(TeacherFiledVo entity) { Teacher teacher = dao.get(entity.getId()); + teacher.setPhoto(entity.getPhoto()); + teacher.setWorkExperience(entity.getWorkExperience()); + teacher.setCourses(entity.getCourses()); + teacher.setExpertise(entity.getExpertise()); dao.update(teacher); } From 836321fabaa08e9100f88db89031f3c4e1503128 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 14 Dec 2022 19:29:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=99=E6=8E=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/boecase/api/CasesApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 235cf9a2..15336964 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -151,7 +151,7 @@ public class CasesApi extends ApiBaseController { } response.setContentType("application/octet-stream"); - response.setHeader("Content-disposition", "attachment;filename=Teachers.xls"); + response.setHeader("Content-disposition", "attachment;filename=cases.xls"); ExportsExcelSenderUtil.export(map,exportVos, OutputStream,"yyyy-MM-dd HH:mm:ss"); }catch (Exception e){ log.error("导出失败",e.getMessage());