From e44f07bb95bc949af5532beeeeab688fdafc4189 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 19 九月 2023 11:25:44 +0800
Subject: [PATCH] 实体
---
phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java | 13 ++++
phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java | 6 -
phis-download-feign/src/main/java/com/hz/his/dto/DLevelChangeDto.java | 16 +++++
phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java | 3
phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java | 7 -
phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java | 3
phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java | 6 -
phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java | 3
phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java | 5 -
phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java | 13 ++++
phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java | 13 ++++
phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java | 13 ++++
phis-download-feign/src/main/java/com/hz/his/dto/DCouponNumberDto.java | 7 -
phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java | 7 -
phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java | 10 --
phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java | 7 -
phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java | 32 ++++++++++
17 files changed, 122 insertions(+), 42 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
index 41d7736..7ce42de 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import com.hz.his.dto.common.OperateDto;
import lombok.Data;
@@ -8,7 +9,7 @@
* 瀵煎嚭棰勭害Dto
*/
@Data
-public class DAppointDto extends OperateDto {
+public class DAppointDto extends DCommonDto {
private String startTime;
private String endTime;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DCouponNumberDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DCouponNumberDto.java
index 9fffabb..e3bc145 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DCouponNumberDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DCouponNumberDto.java
@@ -1,6 +1,7 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
import java.util.Date;
@@ -9,15 +10,11 @@
* 浼樻儬鍒哥爜
**/
@Data
-public class DCouponNumberDto{
- private String searchData;
+public class DCouponNumberDto extends DCommonDto {
private String couponId;
- private Date startTime;
- private Date endTime;
private Date startCollectionTime;
private Date endCollectionTime;
private Integer isUse;
- private String keyWord;
private String couponCostDepartment;
private Integer isReceive;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
index a726f15..e2ea779 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
@@ -1,6 +1,7 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
import java.util.Date;
@@ -9,11 +10,7 @@
* 鎵ц璁板綍
**/
@Data
-public class DDeductionDto{
-
- private Date startTime;
- private Date endTime;
- private String keyWord;
+public class DDeductionDto extends DCommonDto {
private Integer status;
private String shopId;
private String departmentCode;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java
new file mode 100644
index 0000000..c562660
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 璁惧
+ **/
+@Data
+public class DDeviceDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
index db53b84..141973a 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import com.hz.his.dto.common.OperateDto;
import lombok.Data;
@@ -8,7 +9,7 @@
* 瀵煎嚭鍛樺伐Dto
*/
@Data
-public class DEmployeeDto extends OperateDto {
+public class DEmployeeDto extends DCommonDto {
private Integer isJob;
private Integer isPerformanceEmp;
private String roleUniqueStr;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java
new file mode 100644
index 0000000..3759f6d
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒濊瘖鍗�
+ **/
+@Data
+public class DFirstTreatCardDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DLevelChangeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DLevelChangeDto.java
new file mode 100644
index 0000000..abc4bcb
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DLevelChangeDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 绛夌骇鍙樺寲
+ **/
+@Data
+public class DLevelChangeDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java
new file mode 100644
index 0000000..ee67f2a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閲戦鍙樺姩
+ **/
+@Data
+public class DMoneyLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
index d930c86..26aa136 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
@@ -1,15 +1,13 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 鏀舵鏄庣粏
**/
@Data
-public class DPayDetailDto {
-
- private String startTime;
- private String endTime;
+public class DPayDetailDto extends DCommonDto {
}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
index 513bba6..a9ab21b 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
@@ -1,13 +1,14 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 椤圭洰SKU
**/
@Data
-public class DProjectSkuDto {
+public class DProjectSkuDto extends DCommonDto {
private String name;
private Integer enable;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
index 0b0506d..02f894e 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
@@ -1,20 +1,18 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 閫�娆惧崟
**/
@Data
-public class DRefundDto {
+public class DRefundDto extends DCommonDto {
private String shopId;
private String sourceType;
private Integer status;
- private String keyWord;
- private String startTime;
- private String endTime;
private String roleId;
}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
index d597012..8acb3ab 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
@@ -1,7 +1,7 @@
package com.hz.his.dto;
-import com.hz.his.dto.common.PageDto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
import java.util.Date;
@@ -10,12 +10,9 @@
* 鍒拌璁板綍
**/
@Data
-public class DReturnVisitDto extends PageDto {
+public class DReturnVisitDto extends DCommonDto {
private String userId;
- private String keyWord;
- private Date startTime;
- private Date endTime;
private Date planStartTime;
private Date planEndTime;
private Date returnVisitStartTime;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java
new file mode 100644
index 0000000..f733adc
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閫氳瘽璁板綍鍙樺姩
+ **/
+@Data
+public class DTelLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
index 6d243cb..2460d9a 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
@@ -1,7 +1,7 @@
package com.hz.his.dto;
-import com.hz.his.dto.common.PageDto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
import java.util.List;
@@ -10,18 +10,12 @@
* 娌荤枟鍗�
**/
@Data
-public class DTreatSingleDto extends PageDto {
+public class DTreatSingleDto extends DCommonDto {
//鐢ㄦ埛id
private String userId;
//绫诲瀷
private Integer type;
- //寮�濮嬫椂闂�
- private String startTime;
- //缁撴潫鏃堕棿
- private String endTime;
- //鍏抽敭璇�
- private String keyWord;
//娌荤枟鍗曞彿
private String treatSingleNo;
//鎿嶄綔浜�
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
index d263e82..f2c2090 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
@@ -1,13 +1,14 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 鍒拌璁㈠崟(瀵煎尰)
**/
@Data
-public class DVisitOrderDto {
+public class DVisitOrderDto extends DCommonDto {
private String doctorName;
private String userName;
@@ -15,8 +16,6 @@
private String nurseName;
private String shopId;
private String status;
- private String startTime;
- private String endTime;
}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
index 2a52f01..9ec9337 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
@@ -1,20 +1,17 @@
package com.hz.his.dto;
-import com.hz.his.dto.common.PageDto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 鍒拌璁板綍
**/
@Data
-public class DVisitRecordDto extends PageDto {
+public class DVisitRecordDto extends DCommonDto {
private String userId;
private String shopId;
- private String startTime;
- private String endTime;
- private String keyWord;
private String preTypeName;
private String doctorName;
private String nurseName;
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
new file mode 100644
index 0000000..d92a6b9
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ */
+@Data
+public class DCommonDto {
+ /**鎿嶄綔浜烘爣璇�*/
+ String operateId;
+ /**鎿嶄綔浜哄悕绉�*/
+ String operateMan;
+
+ /**鎼滅储*/
+ private String searchData;
+ /**寮�濮�*/
+ private String startTime;
+ /**缁撴潫*/
+ private String endTime;
+ /**鍏抽敭瀛�*/
+ private String keyWord;
+ /**鐢ㄦ埛淇℃伅鍏抽敭瀛�*/
+ private String userKeyWord;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+
+}
--
Gitblit v1.8.0