From 7bd47aa9378d93c86cd40a9448fb58d1b640abc5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 04 九月 2023 14:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java |  146 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 140 insertions(+), 6 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
index 4816cdf..d6b575a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -2,6 +2,7 @@
 
 import com.hz.his.dto.PageDto;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -47,6 +48,8 @@
     private String facePlan;
     //婊℃剰搴� 0=涓嶆弧鎰� 1=涓�鑸� 2=婊℃剰
     private Integer satisfie;
+    //鍒涘缓鏃堕棿
+    private Date createTime;
 
     //鏈娌荤枟椤圭洰 澶氫釜閫楀彿鍒嗗壊
     private String treatProjectIds;
@@ -68,8 +71,34 @@
     //灏忕▼搴忔悳绱㈡椂 鏈変釜椤甸潰鏄渶瑕佷紶鏃堕棿鐨�
     private String startTime;
     private String endTime;
-    //his鍔╂墜 鏌ヨ鍜ㄨ璁板綍鎸夌収鍒涘缓浜烘潵鏌ヨ
-    private String employeeId;
+
+    //鎼滅储鏉′欢
+    //鐢ㄦ埛鍚嶆煡鎵�
+    private String userName;
+    //瀹㈡埛鏉ユ簮娓犻亾鍒嗙被
+    private String channelsTypeId;
+    //瀹㈡埛鏉ユ簮涓�绾ф笭閬�
+    private String channelId;
+    //瀹㈡埛鏉ユ簮浜岀骇娓犻亾
+    private String channel2Id;
+    //鍜ㄨ甯�
+    private String hisCorpUserId;
+    //鐢电綉鍜ㄨ甯�
+    private String internetCorpUserId;
+    //瀹㈡湇
+    private String chatCorpUserId;
+    //鍒涘缓浜�
+    private String createEmployeeId;
+    //鍒涘缓浜洪儴闂�
+    private String createEmployeePartId;
+    //鍏虫敞娲诲姩
+    private String focusActivityId;
+    //鍒拌绫诲瀷
+    private String recentVisitType;
+    //鍒拌鐘舵��
+    private Integer recentVisitStatus;
+    //鏄惁鎴愪氦
+    private Integer isMakeADeal;
 
     public ConsultRecordDto() {
     }
@@ -284,11 +313,116 @@
         this.endTime = endTime;
     }
 
-    public String getEmployeeId() {
-        return employeeId;
+
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setEmployeeId(String employeeId) {
-        this.employeeId = employeeId;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getChannelsTypeId() {
+        return channelsTypeId;
+    }
+
+    public void setChannelsTypeId(String channelsTypeId) {
+        this.channelsTypeId = channelsTypeId;
+    }
+
+    public String getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannel2Id() {
+        return channel2Id;
+    }
+
+    public void setChannel2Id(String channel2Id) {
+        this.channel2Id = channel2Id;
+    }
+
+    public String getHisCorpUserId() {
+        return hisCorpUserId;
+    }
+
+    public void setHisCorpUserId(String hisCorpUserId) {
+        this.hisCorpUserId = hisCorpUserId;
+    }
+
+    public String getInternetCorpUserId() {
+        return internetCorpUserId;
+    }
+
+    public void setInternetCorpUserId(String internetCorpUserId) {
+        this.internetCorpUserId = internetCorpUserId;
+    }
+
+    public String getChatCorpUserId() {
+        return chatCorpUserId;
+    }
+
+    public void setChatCorpUserId(String chatCorpUserId) {
+        this.chatCorpUserId = chatCorpUserId;
+    }
+
+    public String getCreateEmployeeId() {
+        return createEmployeeId;
+    }
+
+    public void setCreateEmployeeId(String createEmployeeId) {
+        this.createEmployeeId = createEmployeeId;
+    }
+
+    public String getCreateEmployeePartId() {
+        return createEmployeePartId;
+    }
+
+    public void setCreateEmployeePartId(String createEmployeePartId) {
+        this.createEmployeePartId = createEmployeePartId;
+    }
+
+    public String getFocusActivityId() {
+        return focusActivityId;
+    }
+
+    public void setFocusActivityId(String focusActivityId) {
+        this.focusActivityId = focusActivityId;
+    }
+
+    public String getRecentVisitType() {
+        return recentVisitType;
+    }
+
+    public void setRecentVisitType(String recentVisitType) {
+        this.recentVisitType = recentVisitType;
+    }
+
+    public Integer getRecentVisitStatus() {
+        return recentVisitStatus;
+    }
+
+    public void setRecentVisitStatus(Integer recentVisitStatus) {
+        this.recentVisitStatus = recentVisitStatus;
+    }
+
+    public Integer getIsMakeADeal() {
+        return isMakeADeal;
+    }
+
+    public void setIsMakeADeal(Integer isMakeADeal) {
+        this.isMakeADeal = isMakeADeal;
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0