From e180e3a496d6f29d3a3b34016400de9d997c6bd9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 07 四月 2026 14:42:23 +0800
Subject: [PATCH] 省立同德满意度功能提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 16d9393..e06e99f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,23 +1,23 @@
package com.ruoyi.common.core.domain.entity;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import javax.validation.constraints.*;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.*;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -25,9 +25,13 @@
* @author ruoyi
*/
@Data
+@Component
@ApiModel(value = "SysUser", description = "鐢ㄦ埛瀵硅薄")
public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L;
+//
+// @Value("${isAdmin}")
+// private List<Long> isAdmin;
/**
* 鐢ㄦ埛ID
@@ -41,6 +45,12 @@
*/
@ApiModelProperty(value = "his鐢ㄦ埛ID")
private String hisUserId;
+
+ /**
+ * his鐢ㄦ埛ID
+ */
+ @ApiModelProperty(value = "his鐢ㄦ埛ID")
+ private String userCode;
/**
* 閮ㄩ棬ID
@@ -76,6 +86,20 @@
@ApiModelProperty(value = "鑱屼綅")
@Excel(name = "鑱屼綅")
private String title;
+
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ @Excel(name = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptName;
/**
* 鐢ㄦ埛閭
@@ -152,14 +176,14 @@
private Date loginDate;
/**
- * 闄㈠尯淇℃伅
- */
- @ApiModelProperty(value = "闄㈠尯淇℃伅")
- private String hospInfo;
- /**
* 绉戝淇℃伅
*/
@ApiModelProperty(value = "绉戝淇℃伅")
+ private String hospInfo;
+ /**
+ * 鐥呭尯淇℃伅
+ */
+ @ApiModelProperty(value = "鐥呭尯淇℃伅")
private String deptInfo;
/**
@@ -228,9 +252,23 @@
@ApiModelProperty("绉戝闆嗗悎")
private List<Map<String, Object>> belongDepts = new ArrayList();
+ /**
+ * 婊℃剰搴﹀垎绫�
+ */
+ @ApiModelProperty("婊℃剰搴﹀垎绫伙紙闂嵎/璇煶锛�")
+ private Map<String, Object> satisfactionCategories = new HashMap<>();
+
public SysUser() {
+ }
+
+ public Map<String, Object> getSatisfactionCategories() {
+ return satisfactionCategories;
+ }
+
+ public void setSatisfactionCategories(Map<String, Object> satisfactionCategories) {
+ this.satisfactionCategories = satisfactionCategories;
}
public List<Map<String, Object>> getBelongWards() {
@@ -301,13 +339,13 @@
this.userId = userId;
}
- public boolean isAdmin() {
- return isAdmin(this.userId);
- }
-
- public static boolean isAdmin(Long userId) {
- return userId != null && 1L == userId;
- }
+// public boolean isAdmin() {
+// return isAdmin(this.userId);
+// }
+//
+// public boolean isAdmin(Long userId) {
+// return isAdmin.contains(userId);
+// }
public Long getDeptId() {
return this.deptId;
--
Gitblit v1.9.3