From 585544f311607a0644d97bafc43b34594cbd8b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Mon, 16 Nov 2026 13:44:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/budwk/app/sys/models/Sys_user.java | 33 +++++++++++-------- .../impl/SysDataUserPullServiceImpl.java | 28 +++------------- .../views/layouts/v4/baseLayout.html | 4 +-- .../statistics/comprehensive/index.html | 14 +++++--- .../statistics/comprehensive/queryForm.js | 33 +------------------ 5 files changed, 36 insertions(+), 76 deletions(-) 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 a74ff53..760c235 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 @@ -49,7 +49,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("性别") @ColDefine(type = ColType.VARCHAR, width = 10) - @DataCenterColumn(name = "性别", key = "XB", dict = "USER_SEX") + @DataCenterColumn(name = "性别", key = "XBDM", dict = "USER_SEX") private String sex; @Column @@ -71,7 +71,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("政治面貌") @ColDefine(type = ColType.VARCHAR, width = 100) - @DataCenterColumn(name = "政治面貌", key = "ZZMMM", dict = "USER_POLITICAL") + @DataCenterColumn(name = "政治面貌", key = "ZZMMDM", dict = "USER_POLITICAL") private String political; @Column @@ -82,7 +82,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("民族") @ColDefine(type = ColType.VARCHAR, width = 20) - @DataCenterColumn(name = "民族", key = "MZM", dict = "USER_NATION") + @DataCenterColumn(name = "民族", key = "MZDM", dict = "USER_NATION") private String nation; @Column @@ -110,7 +110,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("手机号码") @ColDefine(type = ColType.VARCHAR, width = 32) - @DataCenterColumn(name = "手机号码", key = "YDDH") + @DataCenterColumn(name = "手机号码", key = "SJHM") private String mobile; @Column @@ -127,7 +127,6 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("学位") @ColDefine(type = ColType.VARCHAR, width = 50) -// @DataCenterColumn(name = "学位", key = "zgxwmc") @DataCenterColumn(name = "学位", key = "ZGXWMC") private String academicDegree; @@ -138,7 +137,7 @@ public class Sys_user extends BaseModel implements Serializable { private String jobCategory; @Column - @Comment("职称") + @Comment("职务") @ColDefine(type = ColType.VARCHAR, width = 50) @DataCenterColumn(name = "职称", key = "ZYJSZWDMMC") private String professionalTitle; @@ -151,19 +150,23 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("职工来源") @ColDefine(type = ColType.VARCHAR, width = 50) -// @DataCenterColumn(name = "职工来源", key = "zgly") private String employeeSource; @Column @Comment("行政级别(用于管理岗位)") @ColDefine(type = ColType.VARCHAR, width = 50) -// @DataCenterColumn(name = "行政级别(用于管理岗位)", key = "xzjb") private String administrativeLevel; @Column - @Comment("岗位系列") + @Comment("职务") @ColDefine(type = ColType.VARCHAR, width = 50) -// @DataCenterColumn(name = "岗位系列", key = "gwxl") + @DataCenterColumn(name = "专业技术职务", key = "ZYJSZWDMMC") + private String position; + + @Column + @Comment("党政职务") + @ColDefine(type = ColType.VARCHAR, width = 50) + @DataCenterColumn(name = "党政职务", key = "DZZW") private String positionSeries; @Column @@ -181,12 +184,13 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("来校时间") @ColDefine(type = ColType.VARCHAR, width = 10) - @DataCenterColumn(name = "来校时间", key = "LXNY") + @DataCenterColumn(name = "来校时间", key = "LXRQ") private String arrivalAtSchoolDate; @Column @Comment("工作时间") @ColDefine(type = ColType.VARCHAR, width = 10) + @DataCenterColumn(name = "工作时间", key = "工作时间") private String workDate; @Column @@ -197,7 +201,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("在职状态") @ColDefine(type = ColType.VARCHAR, width = 30) - @DataCenterColumn(name = "当前状态码", key = "DQZT", dict = "USER_STATE") + @DataCenterColumn(name = "当前状态码", key = "DQZTDM", dict = "USER_STATE") private String userState; @Column @@ -214,7 +218,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("人员类型") @ColDefine(type = ColType.VARCHAR, width = 30) - @DataCenterColumn(name = "人员类型", key = "RYLX", dict = "USER_PERSON_TYPE") + @DataCenterColumn(name = "用人方式", key = "YRFSDM", dict = "USER_PERSON_TYPE") private String personType; @Column @@ -281,7 +285,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @DataCenterColumn(name = "单位", key = "SZDWH") + @DataCenterColumn(name = "单位", key = "SZDWDM") private String unitId; @Column @@ -351,6 +355,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("家庭住址") @ColDefine(type = ColType.VARCHAR, width = 100) + @DataCenterColumn(name = "有效通讯地址", key = "YXTXDZ") private String homeAddress; @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 4c83ab3..42cd49c 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 @@ -121,21 +121,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl // 字典码表Map,key为父级编码,value为子级字典列表 Map> dataDictMap = dataDictList.stream().collect(Collectors.groupingBy(Sys_data_dict::getParentCode)); - List rawDataList = new ArrayList<>(); - if (dataCenterProperties.isTokenEnabled()) { - String accessToken = getDmpAccessToken(); - rawDataList.addAll(pullDmpUsers(getDmpUrl(DMP_TEACHER_KEY), accessToken, "在岗教职工")); - rawDataList.addAll(pullDmpUsers(getDmpUrl(DMP_DISPATCH_KEY), accessToken, "在岗劳务派遣")); - } else { - 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", "MZDM", "MZM"); - for (JSONObject raw : rawDataList) { - fieldAliases.forEach((source, target) -> raw.set(target, raw.get(source))); - } - } - rawDataList = distinctDmpUsers(rawDataList); + List rawDataList = distinctDmpUsers(DataCenterUtil.pullData(getDmpUrl(DMP_TEACHER_KEY))); if (rawDataList.isEmpty()) { throw new BaseException("当前未获取到人员数据,中止本次同步"); @@ -145,7 +131,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl // 人员单位号先与单位表批量比对,缺失单位只同步一次,避免逐人查询单位表。 Set sourceUnitIds = rawDataList.stream() - .map(raw -> raw.getStr("SZDWH")) + .map(raw -> raw.getStr("SZDWDM")) .filter(StrUtil::isNotBlank) .collect(Collectors.toSet()); Map unitMap = dao().query(Sys_unit.class, Cnd.NEW()).stream() @@ -194,7 +180,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl .findFirst().orElse(new Sys_data_dict()); mapping.field.set(sysUser, StrUtil.blankToDefault(sysDataDict.getName(), raw.getStr(mapping.key))); } else { - if ("LXNY".equals(mapping.key)) { + if ("LXRQ".equals(mapping.key)) { mapping.field.set(sysUser, normalizeArrivalAtSchoolDate(raw.getStr(mapping.key))); } else { mapping.field.set(sysUser, raw.getStr(mapping.key)); @@ -222,7 +208,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl } } sysUser.setUnitName(raw.getStr("SZDW")); - String sourceUnitId = raw.getStr("SZDWH"); + String sourceUnitId = raw.getStr("SZDWDM"); String parentUnitId = tertiaryParentUnitIds.get(sourceUnitId); sysUser.setUnitId(StrUtil.blankToDefault(parentUnitId, sourceUnitId)); sysUser.setThreeUnitId(parentUnitId == null ? null : sourceUnitId); @@ -261,7 +247,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl /** * 规范化信息中心返回的来校时间。 - * 入参 arrivalAtSchoolDate 对应信息中心 LXNY 字段,允许 yyyy-MM-dd 或 yyyy-MM; + * 入参 arrivalAtSchoolDate 对应信息中心 LXRQ 字段,允许 yyyy-MM-dd 或 yyyy-MM; * 返回值用于 sys_user_source.arrivalAtSchoolDate 和后续 sys_user.arrivalAtSchoolDate,年月格式统一补为当月 01 日。 */ private String normalizeArrivalAtSchoolDate(String arrivalAtSchoolDate) { @@ -373,10 +359,6 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl * 入参 url 为人员接口地址,accessToken 为信息中心令牌,sourceName 用于日志区分接口来源。 * 返回值为该接口所有分页合并后的原始人员 JSON 列表。 */ - private List pullDmpUsers(String url, String accessToken, String sourceName) { - return pullDmpUsers(url, accessToken, sourceName, null); - } - private List pullDmpUsers(String url, String accessToken, String sourceName, String zgh) { List rawDataList = new ArrayList<>(); int page = 1; diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index 8181248..b172538 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -698,7 +698,7 @@ 应用中心 - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html index 42c0013..8d47401 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html @@ -1,6 +1,13 @@  +
- + @@ -158,14 +165,13 @@ layout("/layouts/platform.html"){ { prop: "mobile", label: "联系电话", width: 120 }, { prop: "political", label: "政治面貌", width: 120, sortable: true}, { prop: "userState", label: "在职状态", width: 120, sortable: true }, - { prop: "personType", label: "人员类型", width: 120, sortable: true, checked: 0 }, // { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, { prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 }, { prop: "unionName", label: "所属工会", width: 120, sortable: true }, { prop: "unitName", label: "所属单位", width: 120, sortable: true }, // 临时屏蔽“人员分类”列表字段,不删除配置,后续需要可恢复。 // { prop: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, + { prop: "personType", label: "人员类型", width: 120, sortable: true }, { prop: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 }, { prop: "idCard", label: "证件号码", width: 120, sortable: true, checked: 0 }, { prop: "marriage", label: "婚姻状况", width: 120, sortable: true, checked: 0 }, @@ -205,7 +211,6 @@ layout("/layouts/platform.html"){ pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) pageForm.userStates = JSON.stringify(this.pageForm.userStates) const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => { return {prop: item.prop, label: item.label} @@ -230,7 +235,6 @@ layout("/layouts/platform.html"){ pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys) pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus) pageForm.userStates = JSON.stringify(this.pageForm.userStates) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js index ec1a83c..c828e69 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js @@ -81,7 +81,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { @click="pageForm.personTypes=[];doSearch()">清空 全部 @@ -113,31 +113,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { - - 人员属性: - - - @@ -235,7 +210,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { personTypes: [], preparedBys: [], aidFundMemberUserTypes: [], - userAttributes: [], userStates: [], memberStatus: [], year: moment().format("YYYY"), @@ -253,7 +227,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { personTypeOptions: [], preparedByOptions: [], aidFundMemberUserTypeOptions: [], - userAttributeOptions: [], userStateOptions: [], memberStatusOptions: [], unions: [], @@ -346,7 +319,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { this.pageForm.personTypes = [] this.pageForm.preparedBys = [] this.pageForm.aidFundMemberUserTypes = [] - this.pageForm.userAttributes = [] this.pageForm.memberStatus = [] this.pageForm.userStates = [] this.pageForm.unionId = [] @@ -387,9 +359,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { this.$businessTool.getDictOptions("AIDFUND_MEMBER_USER_TYPE").then((data) => { this.aidFundMemberUserTypeOptions = data }) - this.$businessTool.getDictOptions("USER_ATTRIBUTE").then((data) => { - this.userAttributeOptions = data - }) this.$businessTool.getDictOptions("USER_STATE").then((data) => { this.userStateOptions = data })