From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 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 ba36af5..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,17 +10,66 @@
* @author fwq
* */
@Data
-public class UserDetailSelectDto extends UserDetailReportDto {
- /**鏌ヨ娲昏穬鑰乂IP鎯呭喌 鍕鹃�変汉鏁帮細鏌ヨ�佹椿璺冿紝鍕鹃�夋祦澶憋細娴佸け 鍕鹃�夋椿璺�/娌夌潯 鏌ョ姸鎬�*/
+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涓湀鏈墽琛�*/
+ private List<Integer> dkProjectList;
+ /**鎶楄“椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
+ private List<Integer> ksProjectList;
+ /**鏍稿績椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
+ private List<Integer> hxProjectList;
- /**RFM 闆嗗悎 R1..R2..绛夐兘鏄崟閫�*/
+ /**RFM涔嬮棿鏄槸銆愪笖銆�,鍚勮嚜鏄�愭垨銆�*/
+ /**鏌ヨRFM鐨凴1,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+ private List<String> rrOneList;
+ /**鏌ヨRFM鐨凢1,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+ private List<String> ffOneList;
+ /**鏌ヨRFM鐨凢2,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+ private List<String> ffTwoList;
+ /**鏌ヨRFM鐨凪1,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+ private List<String> mmOneList;
+ /**鏌ヨRFM鐨凪2,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+ private List<String> mmTwoList;
- /**瀹㈢兢:绛夌骇鍗曢�夛紝瑙﹁揪鍗曢��*/
+ /**瀹㈢兢涔嬮棿鏄�愭垨銆�,鍚勮嚜涔熸槸銆愭垨銆�*/
+ /**A瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+ private List<Integer> aaLevelList;
+ /**B瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+ private List<Integer> bbLevelList;
+ /**C瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+ private List<Integer> ccLevelList;
+ /**D瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+ private List<Integer> ddLevelList;
+
+ /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑鐢�'-'鎷兼帴鐨勯泦鍚�),涔嬮棿銆愭垨銆戠殑鍏崇郴,鍚勮嚜涔熸槸銆愪笖銆�*/
+ private List<String> planList;
+
}
--
Gitblit v1.8.0