From 6e351c6829cdf23be9c0090b48c3a3a1bdde2a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Fri, 23 Oct 2026 11:03:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/budwk/app/sys/models/Sys_user.java | 4 +-- .../impl/SysDataUserPullServiceImpl.java | 2 +- .../resources/db/data_center_person_type.sql | 32 +++++++++++++++++++ .../module/activity/UserDataScope.vue | 4 +-- .../components/module/activity/UserScope.vue | 4 +-- .../components/module/userInfo/index.vue | 2 +- 6 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/db/data_center_person_type.sql diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user.java b/src/main/java/com/budwk/app/sys/models/Sys_user.java index 48f34b5..4b0be72 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user.java @@ -210,9 +210,9 @@ public class Sys_user extends BaseModel implements Serializable { private String dutySituation; @Column - @Comment("教职工类别码") + @Comment("人员类型") @ColDefine(type = ColType.VARCHAR, width = 30) - @DataCenterColumn(name = "教职工类别码", key = "RYLX", dict = "USER_PERSON_TYPE") + @DataCenterColumn(name = "人员类型", key = "RYLX", dict = "USER_PERSON_TYPE") private String personType; @Column diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java index 11dfc25..be1a46b 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java @@ -130,7 +130,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl rawDataList.addAll(DataCenterUtil.pullData(getDmpUrl(DMP_TEACHER_KEY))); // 将浙师大字段转为现有中间表映射使用的键，保留Token模式的字段协议。 Map fieldAliases = Map.of("XBMC", "XB", "SJHM", "YDDH", - "LXRQ", "LXNY", "DQZTMC", "DQZT", "YRFSDM", "RYLX", "SZDWDM", "SZDWH"); + "LXRQ", "LXNY", "DQZTMC", "DQZT", "YRFSDM", "RYLX", "SZDWDM", "SZDWH", "MZDM", "MZM"); for (JSONObject raw : rawDataList) { fieldAliases.forEach((source, target) -> raw.set(target, raw.get(source))); } diff --git a/src/main/resources/db/data_center_person_type.sql b/src/main/resources/db/data_center_person_type.sql new file mode 100644 index 0000000..519b63c --- /dev/null +++ b/src/main/resources/db/data_center_person_type.sql @@ -0,0 +1,32 @@ +-- 信息中心人员类型编码映射，使用 USER_PERSON_TYPE 字典。 +INSERT INTO sys_data_dict ( + parentCode, name, code, createdBy, createdAt, updatedBy, updatedAt, delFlag +) +SELECT + 'USER_PERSON_TYPE', source.name, source.code, + '', UNIX_TIMESTAMP(NOW()) * 1000, + '', UNIX_TIMESTAMP(NOW()) * 1000, 0 +FROM ( + SELECT '1' AS code, '在编类' AS name + UNION ALL SELECT '1001', '聘用合同制（享受人事代理待遇）' + UNION ALL SELECT '101', '在编' + UNION ALL SELECT '102', '兰溪编制' + UNION ALL SELECT '2', '非在编类' + UNION ALL SELECT '202', '派遣人员' + UNION ALL SELECT '204', '博士后' + UNION ALL SELECT '206', '挂职人员' + UNION ALL SELECT '208', '外籍教师' + UNION ALL SELECT '209', '兼职教师' + UNION ALL SELECT '210', '非学校聘用人员' + UNION ALL SELECT '214', '单位返聘' + UNION ALL SELECT '215', '附属单位' + UNION ALL SELECT '902', '聘用合同制' + UNION ALL SELECT '904', '聘用制专家' + UNION ALL SELECT '905', '人事代理' + UNION ALL SELECT '909', '其他' +) source +WHERE NOT EXISTS ( + SELECT 1 FROM sys_data_dict existing + WHERE existing.parentCode = 'USER_PERSON_TYPE' + AND existing.code = source.code +); diff --git a/src/main/resources/static/components/module/activity/UserDataScope.vue b/src/main/resources/static/components/module/activity/UserDataScope.vue index a187fed..3aa63b3 100644 --- a/src/main/resources/static/components/module/activity/UserDataScope.vue +++ b/src/main/resources/static/components/module/activity/UserDataScope.vue @@ -92,7 +92,7 @@ -->
-
教职工类别
+
人员类型
@@ -236,7 +236,7 @@ module.exports = { {prop: "sex", label: "性别", sortable: true}, {prop: "birthday", label: "出生年月", formatter: this.formatDate}, {prop: "mobile", label: "联系电话"}, - {prop: "personType", label: "教职工类别", sortable: true}, + {prop: "personType", label: "人员类型", sortable: true}, {prop: "userState", label: "在职状态", sortable: true}, {prop: "unitName", label: "所属单位", sortable: true}, {prop: "unionName", label: "所属工会", sortable: true}, diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index d1693b6..295aa5a 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -71,7 +71,7 @@ - 教职工类别： + 人员类型： {{ viewData.identityType }} - {{ viewData.personType }} + {{ viewData.personType }} {{ viewData.userState }} {{ viewData.retireDate ? $moment(viewData.retireDate).format("YYYY-MM-DD") : null }}