diff --git a/db/sql/20250917-新加用户扩展信息.sql b/db/sql/20250917-新加用户扩展信息.sql new file mode 100644 index 0000000..ccceb02 --- /dev/null +++ b/db/sql/20250917-新加用户扩展信息.sql @@ -0,0 +1,10 @@ + +-- ---------------------------- +-- Table structure for health_user_employee_ex +-- ---------------------------- +ALTER TABLE `health_user_employee_ex` + ADD COLUMN `care_liaison_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关爱联络员姓名', + ADD COLUMN `care_liaison_job` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关爱联络员职务', + ADD COLUMN `care_liaison_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关爱联络员电话', + ADD COLUMN `lifeguard_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '急救人员姓名', + ADD COLUMN `lifeguard_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '急救人员电话'; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java index 2036b30..94c7dd0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java @@ -11,7 +11,6 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -467,10 +466,28 @@ public class HealthUserEmployeeEx implements Serializable { @Dict(dicCode = "md_marriage_status") private String mdMarriageStatus; - // 体力活动水平 + @Schema(title = "体力活动水平") private String physicalActivity; - // 昵称 + + @Schema(title = "昵称") private String nickname; + + /** 新疆项目中新增维护员工的关爱人员信息 以及急救人员信息 */ + @Schema(title = "关爱联络员姓名") + private String careLiaisonName; + + @Schema(title = "关爱联络员职务") + private String careLiaisonJob; + + @Schema(title = "关爱联络员电话") + private String careLiaisonPhone; + + @Schema(title = "急救人员姓名") + private String lifeguardName; + + @Schema(title = "急救人员电话") + private String lifeguardPhone; + /** * 岗位id */ diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml index a00a2ea..3e90cff 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml @@ -98,7 +98,12 @@ health_type, height, weight, - md_marriage_status + md_marriage_status, + care_liaison_name, + care_liaison_job, + care_liaison_phone, + lifeguard_name, + lifeguard_phone from health_user_employee_ex a left join sys_user b on a.id = b.id