From 01fa7d72f0f1d334f3ef09cc72def1e7cab86475 Mon Sep 17 00:00:00 2001
From: 18629557246 <1304384689@qq.com>
Date: Thu, 25 Feb 2021 17:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=E5=9E=8B=E3=80=91=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=EF=BC=9A=E6=8C=82=E5=8F=B7=E5=8A=9F=E8=83=BD=20?=
=?UTF-8?q?=E3=80=90=E6=8F=8F=E8=BF=B0=E3=80=911.=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=EF=BC=9ACRUD=20=E3=80=90=E7=A8=8B=E5=BA=8F=E3=80=91Register=20?=
=?UTF-8?q?RegisterController=20RegisterDao.java=20RegisterDao.xml=20Regis?=
=?UTF-8?q?terService=20RegisterServiceImpl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/RegisterController.java | 9 ++--
.../com/woniu/hospitalms/dao/RegisterDao.java | 1 +
.../com/woniu/hospitalms/dto/RegisterDTO.java | 45 +++++++++++++++++++
.../com/woniu/hospitalms/entity/Register.java | 9 ++++
.../hospitalms/service/RegisterService.java | 5 ++-
.../service/impl/RegisterServiceImpl.java | 9 ++--
src/main/resources/mapper/RegisterDao.xml | 7 +--
7 files changed, 72 insertions(+), 13 deletions(-)
create mode 100644 src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java
diff --git a/src/main/java/com/woniu/hospitalms/controller/RegisterController.java b/src/main/java/com/woniu/hospitalms/controller/RegisterController.java
index 1993706..2136142 100644
--- a/src/main/java/com/woniu/hospitalms/controller/RegisterController.java
+++ b/src/main/java/com/woniu/hospitalms/controller/RegisterController.java
@@ -1,5 +1,6 @@
package com.woniu.hospitalms.controller;
+import com.woniu.hospitalms.dto.RegisterDTO;
import com.woniu.hospitalms.dto.ResponseDTO;
import com.woniu.hospitalms.entity.Medicine;
import com.woniu.hospitalms.entity.Register;
@@ -44,15 +45,15 @@ public class RegisterController {
* Description : 根据条件查询挂号信息
* ChangeLog : 1. 创建 (2021/2/22 17:32 [shixin]);
*
- * @param register
+ * @param registerDTO
* @return com.woniu.hospitalms.entity.Register
*/
@RequestMapping("/select")
@ResponseBody
- public ResponseDTO select(@RequestBody Register register) {
+ public ResponseDTO select(@RequestBody RegisterDTO registerDTO) {
- if (registerService.select(register) != null)
- return ResponseDTO.builder().code(200).message("OK").data(registerService.select(register))
+ if (registerService.select(registerDTO) != null)
+ return ResponseDTO.builder().code(200).message("OK").data(registerService.select(registerDTO))
.build();
else
return ResponseDTO.builder().code(500).message("No data found")
diff --git a/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java b/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java
index 505001c..1e8bb79 100644
--- a/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java
+++ b/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java
@@ -1,5 +1,6 @@
package com.woniu.hospitalms.dao;
+import com.woniu.hospitalms.dto.RegisterDTO;
import com.woniu.hospitalms.entity.Register;
import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java b/src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java
new file mode 100644
index 0000000..a880795
--- /dev/null
+++ b/src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java
@@ -0,0 +1,45 @@
+package com.woniu.hospitalms.dto;
+
+
+
+import com.woniu.hospitalms.entity.Register;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author shixin
+ * Date: 2/24/21 10:27 AM
+ * Description:
+ */
+@Builder
+@Getter
+@Setter
+public class RegisterDTO {
+ /**
+ * 属性筛选条件
+ */
+ private Register register;
+ /**
+ * 模糊查询筛选条件
+ */
+ private String keywords;
+ /**
+ * 起始日期
+ */
+ private Date startDate;
+ /**
+ * 终止日期
+ */
+ private Date endDate;
+ /**
+ * 根据关键字拼接 % 并返回
+ *
+ * @return String
+ */
+ public String getLike() {
+ return (keywords == null) ? (null) : ("%" + keywords + "%");
+ }
+}
diff --git a/src/main/java/com/woniu/hospitalms/entity/Register.java b/src/main/java/com/woniu/hospitalms/entity/Register.java
index 007d4b4..18fb7ab 100644
--- a/src/main/java/com/woniu/hospitalms/entity/Register.java
+++ b/src/main/java/com/woniu/hospitalms/entity/Register.java
@@ -73,7 +73,16 @@ public class Register {
/*
*患者名字
*/
+
private String name;
+ /**
+ * 起始日期
+ */
+ private Date startDate;
+ /**
+ * 终止日期
+ */
+ private Date endDate;
/*
*软删除
diff --git a/src/main/java/com/woniu/hospitalms/service/RegisterService.java b/src/main/java/com/woniu/hospitalms/service/RegisterService.java
index 64d0865..4ac4c8d 100644
--- a/src/main/java/com/woniu/hospitalms/service/RegisterService.java
+++ b/src/main/java/com/woniu/hospitalms/service/RegisterService.java
@@ -1,6 +1,7 @@
package com.woniu.hospitalms.service;
import com.github.pagehelper.PageInfo;
+import com.woniu.hospitalms.dto.RegisterDTO;
import com.woniu.hospitalms.entity.Register;
import java.util.List;
@@ -26,11 +27,11 @@ public interface RegisterService {
* Description : 条件查询
* ChangeLog : 1. 创建 (2021/2/23 9:55 [shixin]);
*
- * @param register 实例对象
+ * @param registerDTO 实例对象
* @return com.woniu.hospitalms.entity.Register 实例对象
*/
- PageInfo select(Register register);
+ PageInfo select(RegisterDTO registerDTO);
/**
* Description : 通过id查询name
diff --git a/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java b/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java
index 09b9d32..1cf97ba 100644
--- a/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java
+++ b/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java
@@ -3,6 +3,7 @@ package com.woniu.hospitalms.service.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.woniu.hospitalms.dao.RegisterDao;
+import com.woniu.hospitalms.dto.RegisterDTO;
import com.woniu.hospitalms.entity.Employee;
import com.woniu.hospitalms.entity.Register;
import com.woniu.hospitalms.service.RegisterService;
@@ -33,14 +34,14 @@ public class RegisterServiceImpl implements RegisterService {
/**
* Description : 查询挂号单
* ChangeLog : 1. 创建 (2021/2/23 9:24 [shixin]);
- * @param register
+ * @param registerDTO
* @return com.woniu.hospitalms.entity.Register
*/
@Override
- public PageInfo select(Register register) {
- PageHelper.startPage(register.getPageNum(), register.getPageSize());
- List registers = registerDao.select(register);
+ public PageInfo select(RegisterDTO registerDTO) {
+ PageHelper.startPage(registerDTO.getRegister().getPageNum(), registerDTO.getRegister().getPageSize());
+ List registers = registerDao.select(registerDTO.getRegister());
PageInfo registerPageInfo = new PageInfo<>(registers);
return registerPageInfo;
}
diff --git a/src/main/resources/mapper/RegisterDao.xml b/src/main/resources/mapper/RegisterDao.xml
index 5406eee..185bb95 100644
--- a/src/main/resources/mapper/RegisterDao.xml
+++ b/src/main/resources/mapper/RegisterDao.xml
@@ -40,12 +40,13 @@
and doctor = #{doctor}
-
- and `date` = #{date}
-
and p.name like "%"#{name}"%"
+
+
+ and `date` between #{startDate} and #{endDate}
+
order by re.id
--
Gitee