From f21b42c2bd0a2aee7eaea1e760bcd9f4623817c4 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期六, 07 十月 2023 12:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java | 7 -
phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java | 10 ++
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java | 188 ++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 189 insertions(+), 16 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
index 085b711..0ad3d11 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
@@ -1,16 +1,15 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 璁㈠崟
**/
@Data
-public class DOrderDto {
+public class DOrderDto extends DCommonDto {
- private String startTime;
- private String endTime;
private Integer status;
private String orderNo;
private String type;
@@ -39,12 +38,10 @@
private String doctorName;
private String hisCorpUserName;
private String userName;
- private String userId;
private String shopIds;
private String roleUniqueStr;
private String userStatus;
private String userLevel;
private String internetCorpUserId;
private String internetCorpUserName;
- private String keyWord;
}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
index d07f973..a042d2e 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
@@ -1,12 +1,52 @@
package com.hz.his.dto.user;
+import com.hz.his.dto.common.DCommonDto;
+
import java.util.List;
/**
* 鐢ㄦ埛
**/
-public class DUserDto {
+public class DUserDto{
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operateId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operateMan;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜鸿鑹叉爣璇�(EmployeeRole)*/
+ private String opRoleId;
+ /**鎿嶄綔浜鸿鑹插瓧绗︿覆*/
+ private String opRoleStr;
+ /**鎿嶄綔浜鸿鑹插悕绉�*/
+ private String opRoleName;
+ /**澶囨敞*/
+ private String opRemark;
+
+
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+ /**鎼滅储鍏抽敭瀛�*/
+ private String searchData;
+ /**鎼滅储鍏抽敭瀛�*/
+ private String keyWord;
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鐢ㄦ埛淇℃伅鍏抽敭瀛�*/
+ private String userKeyWord;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private List<String> userIdList;
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**鍛樺伐鏍囪瘑*/
+ private List<String> employeeIdList;
private List<DUserTagDto> userTagInfo;
private Integer appType;
@@ -95,14 +135,148 @@
private Integer expectedLossDay;
- private String keyWord;
-
private Integer isPretriageCard;
private String indication1;
private String indication2;
private Integer indicationLevel;
+
+ public String getOperateId() {
+ return operateId;
+ }
+
+ public void setOperateId(String operateId) {
+ this.operateId = operateId;
+ }
+
+ public String getOperateMan() {
+ return operateMan;
+ }
+
+ public void setOperateMan(String operateMan) {
+ this.operateMan = operateMan;
+ }
+
+ public String getOpShopId() {
+ return opShopId;
+ }
+
+ public void setOpShopId(String opShopId) {
+ this.opShopId = opShopId;
+ }
+
+ public String getOpShopName() {
+ return opShopName;
+ }
+
+ public void setOpShopName(String opShopName) {
+ this.opShopName = opShopName;
+ }
+
+ public String getOpRoleId() {
+ return opRoleId;
+ }
+
+ public void setOpRoleId(String opRoleId) {
+ this.opRoleId = opRoleId;
+ }
+
+ public String getOpRoleStr() {
+ return opRoleStr;
+ }
+
+ public void setOpRoleStr(String opRoleStr) {
+ this.opRoleStr = opRoleStr;
+ }
+
+ public String getOpRoleName() {
+ return opRoleName;
+ }
+
+ public void setOpRoleName(String opRoleName) {
+ this.opRoleName = opRoleName;
+ }
+
+ public String getOpRemark() {
+ return opRemark;
+ }
+
+ public void setOpRemark(String opRemark) {
+ this.opRemark = opRemark;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getSearchData() {
+ return searchData;
+ }
+
+ public void setSearchData(String searchData) {
+ this.searchData = searchData;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserKeyWord() {
+ return userKeyWord;
+ }
+
+ public void setUserKeyWord(String userKeyWord) {
+ this.userKeyWord = userKeyWord;
+ }
+
+ public List<String> getUserIdList() {
+ return userIdList;
+ }
+
+ public void setUserIdList(List<String> userIdList) {
+ this.userIdList = userIdList;
+ }
+
+ public List<String> getShopIdList() {
+ return shopIdList;
+ }
+
+ public void setShopIdList(List<String> shopIdList) {
+ this.shopIdList = shopIdList;
+ }
+
+ public List<String> getEmployeeIdList() {
+ return employeeIdList;
+ }
+
+ public void setEmployeeIdList(List<String> employeeIdList) {
+ this.employeeIdList = employeeIdList;
+ }
public List<DUserTagDto> getUserTagInfo() {
return userTagInfo;
@@ -534,14 +708,6 @@
public void setExpectedLossDay(Integer expectedLossDay) {
this.expectedLossDay = expectedLossDay;
- }
-
- public String getKeyWord() {
- return keyWord;
- }
-
- public void setKeyWord(String keyWord) {
- this.keyWord = keyWord;
}
public Integer getIsPretriageCard() {
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
index d478951..effa337 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
@@ -1,8 +1,14 @@
package com.hz.his.dto.activity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 闄愬埗
@@ -13,4 +19,8 @@
private String id;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+
+ private Date limitStartTime;
+
+ private Date limitEndTime;
}
--
Gitblit v1.8.0