From ebb2edfb7693b9c19fcc383db23fe9a5d5458c35 Mon Sep 17 00:00:00 2001
From: gongzhenkun <1658878546@qq.com>
Date: Tue, 28 Feb 2023 15:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E8=AF=8A=E3=80=81=E6=82=A3=E8=80=85?=
=?UTF-8?q?=E3=80=81=E5=8C=BB=E7=94=9F=E3=80=81=E5=8C=BB=E9=99=A2=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/domain/resp/THospitalPageResp.java | 10 +++++
.../ruoyi/system/domain/resp/TRecordResp.java | 12 +++++
.../resources/mapper/system/TDoctorMapper.xml | 44 +++++++++----------
.../resources/mapper/system/TRecordMapper.xml | 1 +
4 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java
index f9fbd90..d215cd7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java
@@ -34,6 +34,16 @@ public class THospitalPageResp {
@Excel(name = "管理员名称")
private String adminName;
+ private String delFlag;
+
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag() {
+ return delFlag;
+ }
+
public Long getId() {
return id;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java
index a9a4389..e0c3644 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java
@@ -124,6 +124,18 @@ public class TRecordResp
@ApiModelProperty("响应时长")
private Long responseTime;
+ /** 删除标志（0代表存在 2代表删除） */
+ @ApiModelProperty("删除标志（0代表存在 2代表删除） ")
+ private String delFlag;
+
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag() {
+ return delFlag;
+ }
+
public String getHospitalName() {
return hospitalName;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
index 97f19b1..2079604 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
@@ -185,34 +185,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
td.introduction,
td.medical_license AS medicalLicense,
td.medical_license2 AS medicalLicense2,
- qr_code AS qrCode,
- del_flag AS delFlag,
+ td.qr_code AS qrCode,
+ td.del_flag AS delFlag,
td.hospital_id AS hospitalId,
th.`name` AS hospitalName,
- create_time AS createTime,
- update_time AS updateTime
+ td.create_time AS createTime,
+ td.update_time AS updateTime
FROM
t_doctor td
LEFT JOIN t_hospital th ON td.hospital_id = th.id
- AND create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and
+ AND td.create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and
DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
AND td.name like concat('%', #{name}, '%')
- AND identifier like concat('%', #{identifier}, '%')
+ AND td.identifier like concat('%', #{identifier}, '%')
- and hospital_id = #{hospitalId}
+ and td.hospital_id = #{hospitalId}
- and del_flag = #{delFlag}
+ and td.del_flag = #{delFlag}
- order by create_time desc
+ order by td.create_time desc