From 899277d8fba239727875201ee6a060b6c535f743 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 30 九月 2024 18:01:39 +0800
Subject: [PATCH] 1.修改会员来访明细工具逻辑 2.新增查询权限工具类

---
 phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
index 808e953..224d021 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
@@ -1,6 +1,6 @@
 package com.hz.his.dto.report.user;
 
-import com.hz.his.dto.report.UserDetailReportDto;
+import com.hz.his.dto.PageDto;
 import lombok.Data;
 
 import java.util.List;
@@ -10,12 +10,33 @@
  * @author fwq
  * */
 @Data
-public class UserDetailSelectDto extends UserDetailReportDto {
+public class UserDetailSelectDto extends PageDto {
+    /**闂ㄥ簵鏍囪瘑*/
+    private List<String> shopIdList;
+    /**闂ㄥ簵缂栧彿*/
+    private List<String> shopNoList;
+    /**椤鹃棶鏍囪瘑*/
+    private List<String> adviserIdList;
+    /**椤鹃棶缂栧彿*/
+    private List<String> adviserNoList;
+    /**鐧诲綍鍛樺伐鏍囪瘑*/
+    private String loginEmpId;
+    /**鐧诲綍鍛樺伐鍚嶇О*/
+    private String loginCnName;
+    /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+    private String loginEmpStr;
+    /**鎿嶄綔浜�*/
+    private String operatorId;
+    /**鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
+
     /**鏌ヨ娲昏穬鑰乂IP,娴佸け(娴佸け)/娲昏穬(鐘舵��)/娌夌潯(鐘舵��)涔嬮棿鏄�愭垨銆戝叧绯�0:娴佸け 1:娲昏穬 2:娌夌潯*/
     private List<Integer> oldVipList;
 
     /**鏌ヨ瀹㈡埛绛夌骇,绛夌骇涔嬮棿鏄�愭垨銆戝叧绯�*/
     private List<String> userLevelList;
+    /**鏌ヨ瀹㈡埛鐘舵��,鐘舵�佷箣闂存槸銆愭垨銆戝叧绯�*/
+    private List<String> statusList;
 
     /**涓夊ぇ椤圭洰鏈墽琛屽ぇ鐨勬槸銆愪笖銆�,鍚勮嚜鏄�愭垨銆�*/
     /**鎵撳崱椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
@@ -47,8 +68,8 @@
     /**D瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
     private List<Integer> ddLevelList;
 
-    /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑闆嗗悎),涔嬮棿銆愭垨銆戠殑鍏崇郴,鍚勮嚜涔熸槸銆愪笖銆�*/
-    private List<UserPlanDetailDto> planList;
+    /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑鐢�'-'鎷兼帴鐨勯泦鍚�),涔嬮棿銆愭垨銆戠殑鍏崇郴,鍚勮嚜涔熸槸銆愪笖銆�*/
+    private List<String> planList;
 
 
 }

--
Gitblit v1.8.0