From 99a3938ba088c88ebad042459049300d93387c77 Mon Sep 17 00:00:00 2001 From: heminjian502 Date: Tue, 6 Sep 2022 14:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=AE=8C=E5=96=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/SysLoginService.java | 4 ++++ .../java/com/ruoyi/system/domain/TDoctor.java | 12 +++++++++++ .../system/domain/req/AppRegisterReq.java | 20 +++++++++++++++++++ .../system/domain/resp/AppDoctorResp.java | 11 ++++++++++ .../domain/resp/PcTDoctorQueryByPageResp.java | 12 +++++++++++ .../resources/mapper/system/TDoctorMapper.xml | 9 ++++++++- 6 files changed, 67 insertions(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 74b1cde..7512c96 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -183,6 +183,8 @@ public class SysLoginService tDoctor.setName(req.getName()); tDoctor.setSpeciality(req.getSpeciality()); tDoctor.setMedicalLicense(req.getMedicalLicense()); + tDoctor.setMedicalLicense2(req.getMedicalLicense2()); + tDoctor.setTitle(req.getTitle()); tDoctor.setUserId(sysUser.getUserId()); tDoctorMapper.updateTDoctor(tDoctor); } @@ -197,6 +199,8 @@ public class SysLoginService tDoctor.setName(req.getName()); tDoctor.setSpeciality(req.getSpeciality()); tDoctor.setMedicalLicense(req.getMedicalLicense()); + tDoctor.setTitle(req.getTitle()); + tDoctor.setMedicalLicense2(req.getMedicalLicense2()); tDoctor.setUserId(sysUser.getUserId()); tDoctorMapper.insertTDoctor(tDoctor); Long identifier = 10000000L + tDoctor.getId(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDoctor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDoctor.java index 80f3adb..3b962ca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDoctor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDoctor.java @@ -66,6 +66,9 @@ public class TDoctor extends BaseEntity @Excel(name = "职业医师照片路径") private String medicalLicense; + @Excel(name = "职业医师照片路径2") + private String medicalLicense2; + /** 二维码base64 */ @Excel(name = "二维码base64") private String qrCode; @@ -222,6 +225,14 @@ public class TDoctor extends BaseEntity return delFlag; } + public String getMedicalLicense2() { + return medicalLicense2; + } + + public void setMedicalLicense2(String medicalLicense2) { + this.medicalLicense2 = medicalLicense2; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -238,6 +249,7 @@ public class TDoctor extends BaseEntity .append("speciality", getSpeciality()) .append("introduction", getIntroduction()) .append("medicalLicense", getMedicalLicense()) + .append("medicalLicense2", getMedicalLicense2()) .append("qrCode", getQrCode()) .append("hospitalId", getHospitalId()) .append("delFlag", getDelFlag()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/AppRegisterReq.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/AppRegisterReq.java index 12f027e..8f53146 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/AppRegisterReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/AppRegisterReq.java @@ -32,6 +32,26 @@ public class AppRegisterReq implements Serializable { */ private String medicalLicense; + private String medicalLicense2; + + private String title; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getMedicalLicense2() { + return medicalLicense2; + } + + public void setMedicalLicense2(String medicalLicense2) { + this.medicalLicense2 = medicalLicense2; + } + public String getName() { return name; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/AppDoctorResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/AppDoctorResp.java index e0ba830..8e5a3fb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/AppDoctorResp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/AppDoctorResp.java @@ -86,6 +86,9 @@ public class AppDoctorResp implements Serializable { @ApiModelProperty("职业医师照片路径") private String medicalLicense; + @ApiModelProperty("职业医师照片路径2") + private String medicalLicense2; + /** * 二维码base64 */ @@ -223,4 +226,12 @@ public class AppDoctorResp implements Serializable { public void setHospitalId(Long hospitalId) { this.hospitalId = hospitalId; } + + public String getMedicalLicense2() { + return medicalLicense2; + } + + public void setMedicalLicense2(String medicalLicense2) { + this.medicalLicense2 = medicalLicense2; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java index d19ff23..c98764c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java @@ -65,6 +65,9 @@ public class PcTDoctorQueryByPageResp { @ApiModelProperty("职业医师照片路径base64") private String medicalLicense; + @ApiModelProperty("职业医师照片路径base64") + private String medicalLicense2; + /** 二维码base64 */ @ApiModelProperty("二维码base64") private String qrCode; @@ -262,6 +265,14 @@ public class PcTDoctorQueryByPageResp { this.delFlag = delFlag; } + public String getMedicalLicense2() { + return medicalLicense2; + } + + public void setMedicalLicense2(String medicalLicense2) { + this.medicalLicense2 = medicalLicense2; + } + @Override public String toString() { return "PcTDoctorQueryByPageResp{" + @@ -277,6 +288,7 @@ public class PcTDoctorQueryByPageResp { ", speciality='" + speciality + '\'' + ", introduction='" + introduction + '\'' + ", medicalLicense='" + medicalLicense + '\'' + + ", medicalLicense2='" + medicalLicense2 + '\'' + ", qrCode='" + qrCode + '\'' + ", hospitalId=" + hospitalId + ", delFlag='" + delFlag + '\'' + diff --git a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml index e1efc4a..ff4fc28 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml @@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, open_id, user_id, identifier, name, phone, sex, age, marriage, title, speciality, introduction, medical_license, qr_code, hospital_id, del_flag, create_time, update_time from t_doctor + select id, open_id, user_id, identifier, name, phone, sex, age, marriage, title, speciality, introduction, medical_license , medical_license2, qr_code, hospital_id, del_flag, create_time, update_time from t_doctor