From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
smartor/src/main/java/com/smartor/domain/SSOUserInfo.java | 76 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/SSOUserInfo.java b/smartor/src/main/java/com/smartor/domain/SSOUserInfo.java
index 88574e3..d7fd819 100644
--- a/smartor/src/main/java/com/smartor/domain/SSOUserInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/SSOUserInfo.java
@@ -1,19 +1,77 @@
package com.smartor.domain;
+import lombok.Data;
+
+@Data
public class SSOUserInfo {
- private String sub; // 鐢ㄦ埛ID
- private String name; // 鐢ㄦ埛鍚�/宸ュ彿
+
+ /**
+ *韬唤鎻愪緵鑰�
+ */
+ private String idp;
+ /**
+ *涓婚
+ */
+ private String sub;
+ /**
+ *缁勭粐鏈烘瀯id
+ */
+ private String zuZhiJGID;
+ /**
+ *缁勭粐鏈烘瀯鍚嶇О
+ */
+ private String zuZhiJGMC;
+ /**
+ *鍞竴鍚嶇О
+ */
+ private String unique_name;
+ /**
+ *鐢ㄦ埛id
+ */
+ private String yongHuID;
+ /**
+ *鍚嶇О
+ */
+ private String name;
private String nickname; // 鏄剧ず鍚�
+ /**
+ *韬唤璇�
+ */
+ private String id_card;
+ /**
+ *鎵嬫満鍙�
+ */
+ private String phone;
- // getter鍜宻etter鏂规硶
- public String getSub() { return sub; }
- public void setSub(String sub) { this.sub = sub; }
+ /**
+ * 鑱屽伐ID
+ */
+ private String zhiGongID;
- public String getName() { return name; }
- public void setName(String name) { this.name = name; }
+ /**
+ * 鐧诲綍浜鸿处鍙�
+ */
+ private String username;
- public String getNickname() { return nickname; }
- public void setNickname(String nickname) { this.nickname = nickname; }
+ /**
+ * 鏈烘瀯
+ */
+ private String orgid;
+
+ /**
+ * 闄㈠尯
+ */
+ private String campusid;
+
+ /**
+ * 鐥呭尯
+ */
+ private String wardCode;
+
+ /**
+ * 绉戝
+ */
+ private String deptCode;
@Override
public String toString() {
--
Gitblit v1.9.3