From 1302ceef6a460e07ce4dc65a360001451fc9a613 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Fri, 6 Jun 2025 18:07:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E6=95=99=E5=B8=88?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/controller/TeacherController.java | 6 ++++++ .../controller/admin/service/TeacherService.java | 1 + .../admin/service/impl/TeacherServiceImpl.java | 10 ++++++++++ .../model/dto/admin/teacher/GpTeacherDto.java | 1 + .../teammodel/model/entity/teacher/PtTeacherInfo.java | 1 + .../cn/teammodel/repository/PtTeacherRepository.java | 3 ++- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java b/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java index 22900ae..8c01642 100644 --- a/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java +++ b/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java @@ -161,4 +161,10 @@ public class TeacherController { Map res = teacherService.getTeacherRecord(recordDto,request); return R.success(res); } + @PostMapping("getPtTeacherByIds") + @ApiOperation("根据tmdId获取教师基础信息") + public R> getPtTeacherByIds(@Valid @RequestBody GpTeacherDto gpTeacherDto, HttpServletRequest request) { + List res = teacherService.getPtTeacherByIds(gpTeacherDto,request); + return R.success(res); + } } diff --git a/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java b/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java index 65178c9..28b839a 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java +++ b/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java @@ -38,4 +38,5 @@ public interface TeacherService { List > getPtTeacher(TeacherDto teacherDto, HttpServletRequest request); void saveFiveScores(TeacherDto teacherDto, HttpServletRequest request); Map getTeacherRecord(RecordDto recordDto, HttpServletRequest request); + List getPtTeacherByIds(GpTeacherDto gpTeacherDto, HttpServletRequest request); } diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index afb7fce..c9d3fd0 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -2484,6 +2484,16 @@ public class TeacherServiceImpl implements TeacherService { return resMap; } + @Override + public List getPtTeacherByIds(GpTeacherDto gpTeacherDto, HttpServletRequest request) { + try { + //根据id集合查询相关所有教师信息 + return ptTeacherRepository.findTeacherByIds(gpTeacherDto.getSchoolId(), String.format(PK.PTTEACHER, gpTeacherDto.getSchoolId()), gpTeacherDto.getPeriodId(), gpTeacherDto.getIds()); + }catch (Exception e) { + throw new ServiceException(ErrorCode.SYSTEM_ERROR.getCode(), "数据查询异常"); + } + } + private Double parseScore(Object obj, double defaultValue) { if (obj instanceof Number) { return ((Number) obj).doubleValue(); diff --git a/src/main/java/cn/teammodel/model/dto/admin/teacher/GpTeacherDto.java b/src/main/java/cn/teammodel/model/dto/admin/teacher/GpTeacherDto.java index 54e9dce..3fe506e 100644 --- a/src/main/java/cn/teammodel/model/dto/admin/teacher/GpTeacherDto.java +++ b/src/main/java/cn/teammodel/model/dto/admin/teacher/GpTeacherDto.java @@ -17,4 +17,5 @@ public class GpTeacherDto { private String ownerId; private Long startTime; private Long endTime; + private String periodId; } diff --git a/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java b/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java index cd50919..cb0f5e8 100644 --- a/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java +++ b/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java @@ -47,4 +47,5 @@ public class PtTeacherInfo extends BaseItem { public Integer state = 1; public Integer version = 1; public String source; + public String selfIntroduction; } diff --git a/src/main/java/cn/teammodel/repository/PtTeacherRepository.java b/src/main/java/cn/teammodel/repository/PtTeacherRepository.java index 11ef692..3eaa3c4 100644 --- a/src/main/java/cn/teammodel/repository/PtTeacherRepository.java +++ b/src/main/java/cn/teammodel/repository/PtTeacherRepository.java @@ -24,6 +24,7 @@ public interface PtTeacherRepository extends CosmosRepository findAllTeacher(); @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.school = @school and c.code = @code and c.state = 1 and c.status != 'delete' ") List findAdminTeacher(String school,String code); - + @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.school = @school and c.code = @code and c.state = 1 and c.status != 'delete' and c.periodId = @periodId and c.id in (@ids)") + List findTeacherByIds(String school,String code,String periodId,Collection ids); }