From f9a5efd406bd170c4cb17b445d010f5bdc68fdcb Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Wed, 30 Dec 2020 10:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E5=B7=A5=E8=8E=B7=E5=8F=96=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClientPatientController.java | 13 +++++++++++++ .../system/fantang/domain/FtStaffInfoDao.java | 6 ++++++ .../fantang/mapper/FtStaffInfoDaoMapper.java | 6 ++++-- .../fantang/service/IFtStaffInfoDaoService.java | 3 +++ .../service/impl/FtStaffInfoDaoServiceImpl.java | 5 +++++ .../mapper/fantang/FtStaffInfoDaoMapper.xml | 16 +++++++++++++++- 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java index 297921e5a..46ff276e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java @@ -4,7 +4,9 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.domain.FtStaffInfoDao; import com.ruoyi.system.fantang.service.IFtPatientDaoService; +import com.ruoyi.system.fantang.service.IFtStaffInfoDaoService; import com.ruoyi.system.fantang.vo.FtDepartVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,6 +25,9 @@ public class ClientPatientController extends BaseController { @Autowired private IFtPatientDaoService iFtPatientDaoService; + @Autowired + private IFtStaffInfoDaoService iFtStaffInfoDaoService; + @GetMapping("/getReportMealsToday/{patientId}") public AjaxResult getReportMealsToday(@PathVariable("patientId") Long patientId) { @@ -51,4 +56,12 @@ public class ClientPatientController extends BaseController { return AjaxResult.success(ftDepartVo); } + + @GetMapping("/getDepartInfo/{staffId}") + public AjaxResult getDepartInfo(@PathVariable("staffId") Long staffId) { + + FtStaffInfoDao departInfo = iFtStaffInfoDaoService.getDepartInfo(staffId); + + return AjaxResult.success(departInfo); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java index b793f51a2..34143d225 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java @@ -48,6 +48,12 @@ public class FtStaffInfoDao { @TableField(exist = false) private String departName; + /** + * 科室编号 + */ + @TableField(exist = false) + private String departCode; + /** * 姓名 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java index 395a958b0..ce94202cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java @@ -2,7 +2,7 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -15,9 +15,11 @@ import java.util.List; */ public interface FtStaffInfoDaoMapper extends BaseMapper { -// @Select("SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1") + // @Select("SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1") List selectStaffInfoWithDepart(FtStaffInfoDao ftStaffInfoDao); @Update("update ft_staff_info set token=#{token}, login_flag=1 where staff_id=#{staff_id}") void updateLoginStatus(FtStaffInfoDao dao); + + FtStaffInfoDao getDepartInfo(@Param("staffId") Long staffId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java index 9dd48ece5..4c2b028cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.fantang.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.domain.FtDepartDao; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; import java.util.List; @@ -19,4 +20,6 @@ public interface IFtStaffInfoDaoService extends IService { AjaxResult login(String tel, String password); AjaxResult logout(Long staffId); + + FtStaffInfoDao getDepartInfo(Long staffId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java index 06a4bda38..bf0c783ae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java @@ -57,4 +57,9 @@ public class FtStaffInfoDaoServiceImpl extends ServiceImpl - SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1 and a.flag = 1 + SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where + staff_type = 1 and a.flag = 1 and b.depart_id = #{departId} + + \ No newline at end of file