feat: 优化人员信息映射

This commit is contained in:
2026-11-16 13:44:06 +08:00
parent 3683de6013
commit 585544f311
5 changed files with 36 additions and 76 deletions
@@ -49,7 +49,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("性别") @Comment("性别")
@ColDefine(type = ColType.VARCHAR, width = 10) @ColDefine(type = ColType.VARCHAR, width = 10)
@DataCenterColumn(name = "性别", key = "XB", dict = "USER_SEX") @DataCenterColumn(name = "性别", key = "XBDM", dict = "USER_SEX")
private String sex; private String sex;
@Column @Column
@@ -71,7 +71,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("政治面貌") @Comment("政治面貌")
@ColDefine(type = ColType.VARCHAR, width = 100) @ColDefine(type = ColType.VARCHAR, width = 100)
@DataCenterColumn(name = "政治面貌", key = "ZZMMM", dict = "USER_POLITICAL") @DataCenterColumn(name = "政治面貌", key = "ZZMMDM", dict = "USER_POLITICAL")
private String political; private String political;
@Column @Column
@@ -82,7 +82,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("民族") @Comment("民族")
@ColDefine(type = ColType.VARCHAR, width = 20) @ColDefine(type = ColType.VARCHAR, width = 20)
@DataCenterColumn(name = "民族", key = "MZM", dict = "USER_NATION") @DataCenterColumn(name = "民族", key = "MZDM", dict = "USER_NATION")
private String nation; private String nation;
@Column @Column
@@ -110,7 +110,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("手机号码") @Comment("手机号码")
@ColDefine(type = ColType.VARCHAR, width = 32) @ColDefine(type = ColType.VARCHAR, width = 32)
@DataCenterColumn(name = "手机号码", key = "YDDH") @DataCenterColumn(name = "手机号码", key = "SJHM")
private String mobile; private String mobile;
@Column @Column
@@ -127,7 +127,6 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("学位") @Comment("学位")
@ColDefine(type = ColType.VARCHAR, width = 50) @ColDefine(type = ColType.VARCHAR, width = 50)
// @DataCenterColumn(name = "学位", key = "zgxwmc")
@DataCenterColumn(name = "学位", key = "ZGXWMC") @DataCenterColumn(name = "学位", key = "ZGXWMC")
private String academicDegree; private String academicDegree;
@@ -138,7 +137,7 @@ public class Sys_user extends BaseModel implements Serializable {
private String jobCategory; private String jobCategory;
@Column @Column
@Comment("职称") @Comment("职务")
@ColDefine(type = ColType.VARCHAR, width = 50) @ColDefine(type = ColType.VARCHAR, width = 50)
@DataCenterColumn(name = "职称", key = "ZYJSZWDMMC") @DataCenterColumn(name = "职称", key = "ZYJSZWDMMC")
private String professionalTitle; private String professionalTitle;
@@ -151,19 +150,23 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("职工来源") @Comment("职工来源")
@ColDefine(type = ColType.VARCHAR, width = 50) @ColDefine(type = ColType.VARCHAR, width = 50)
// @DataCenterColumn(name = "职工来源", key = "zgly")
private String employeeSource; private String employeeSource;
@Column @Column
@Comment("行政级别(用于管理岗位)") @Comment("行政级别(用于管理岗位)")
@ColDefine(type = ColType.VARCHAR, width = 50) @ColDefine(type = ColType.VARCHAR, width = 50)
// @DataCenterColumn(name = "行政级别(用于管理岗位)", key = "xzjb")
private String administrativeLevel; private String administrativeLevel;
@Column @Column
@Comment("岗位系列") @Comment("职务")
@ColDefine(type = ColType.VARCHAR, width = 50) @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; private String positionSeries;
@Column @Column
@@ -181,12 +184,13 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("来校时间") @Comment("来校时间")
@ColDefine(type = ColType.VARCHAR, width = 10) @ColDefine(type = ColType.VARCHAR, width = 10)
@DataCenterColumn(name = "来校时间", key = "LXNY") @DataCenterColumn(name = "来校时间", key = "LXRQ")
private String arrivalAtSchoolDate; private String arrivalAtSchoolDate;
@Column @Column
@Comment("工作时间") @Comment("工作时间")
@ColDefine(type = ColType.VARCHAR, width = 10) @ColDefine(type = ColType.VARCHAR, width = 10)
@DataCenterColumn(name = "工作时间", key = "工作时间")
private String workDate; private String workDate;
@Column @Column
@@ -197,7 +201,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("在职状态") @Comment("在职状态")
@ColDefine(type = ColType.VARCHAR, width = 30) @ColDefine(type = ColType.VARCHAR, width = 30)
@DataCenterColumn(name = "当前状态码", key = "DQZT", dict = "USER_STATE") @DataCenterColumn(name = "当前状态码", key = "DQZTDM", dict = "USER_STATE")
private String userState; private String userState;
@Column @Column
@@ -214,7 +218,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("人员类型") @Comment("人员类型")
@ColDefine(type = ColType.VARCHAR, width = 30) @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; private String personType;
@Column @Column
@@ -281,7 +285,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@ColDefine(type = ColType.VARCHAR, width = 32) @ColDefine(type = ColType.VARCHAR, width = 32)
@DataCenterColumn(name = "单位", key = "SZDWH") @DataCenterColumn(name = "单位", key = "SZDWDM")
private String unitId; private String unitId;
@Column @Column
@@ -351,6 +355,7 @@ public class Sys_user extends BaseModel implements Serializable {
@Column @Column
@Comment("家庭住址") @Comment("家庭住址")
@ColDefine(type = ColType.VARCHAR, width = 100) @ColDefine(type = ColType.VARCHAR, width = 100)
@DataCenterColumn(name = "有效通讯地址", key = "YXTXDZ")
private String homeAddress; private String homeAddress;
@Column @Column
@@ -121,21 +121,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
// 字典码表Map,key为父级编码,value为子级字典列表 // 字典码表Map,key为父级编码,value为子级字典列表
Map<String, List<Sys_data_dict>> dataDictMap = dataDictList.stream().collect(Collectors.groupingBy(Sys_data_dict::getParentCode)); Map<String, List<Sys_data_dict>> dataDictMap = dataDictList.stream().collect(Collectors.groupingBy(Sys_data_dict::getParentCode));
List<JSONObject> rawDataList = new ArrayList<>(); List<JSONObject> rawDataList = distinctDmpUsers(DataCenterUtil.pullData(getDmpUrl(DMP_TEACHER_KEY)));
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<String, String> 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);
if (rawDataList.isEmpty()) { if (rawDataList.isEmpty()) {
throw new BaseException("当前未获取到人员数据,中止本次同步"); throw new BaseException("当前未获取到人员数据,中止本次同步");
@@ -145,7 +131,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
// 人员单位号先与单位表批量比对,缺失单位只同步一次,避免逐人查询单位表。 // 人员单位号先与单位表批量比对,缺失单位只同步一次,避免逐人查询单位表。
Set<String> sourceUnitIds = rawDataList.stream() Set<String> sourceUnitIds = rawDataList.stream()
.map(raw -> raw.getStr("SZDWH")) .map(raw -> raw.getStr("SZDWDM"))
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
Map<String, Sys_unit> unitMap = dao().query(Sys_unit.class, Cnd.NEW()).stream() Map<String, Sys_unit> unitMap = dao().query(Sys_unit.class, Cnd.NEW()).stream()
@@ -194,7 +180,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
.findFirst().orElse(new Sys_data_dict()); .findFirst().orElse(new Sys_data_dict());
mapping.field.set(sysUser, StrUtil.blankToDefault(sysDataDict.getName(), raw.getStr(mapping.key))); mapping.field.set(sysUser, StrUtil.blankToDefault(sysDataDict.getName(), raw.getStr(mapping.key)));
} else { } else {
if ("LXNY".equals(mapping.key)) { if ("LXRQ".equals(mapping.key)) {
mapping.field.set(sysUser, normalizeArrivalAtSchoolDate(raw.getStr(mapping.key))); mapping.field.set(sysUser, normalizeArrivalAtSchoolDate(raw.getStr(mapping.key)));
} else { } else {
mapping.field.set(sysUser, raw.getStr(mapping.key)); mapping.field.set(sysUser, raw.getStr(mapping.key));
@@ -222,7 +208,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
} }
} }
sysUser.setUnitName(raw.getStr("SZDW")); sysUser.setUnitName(raw.getStr("SZDW"));
String sourceUnitId = raw.getStr("SZDWH"); String sourceUnitId = raw.getStr("SZDWDM");
String parentUnitId = tertiaryParentUnitIds.get(sourceUnitId); String parentUnitId = tertiaryParentUnitIds.get(sourceUnitId);
sysUser.setUnitId(StrUtil.blankToDefault(parentUnitId, sourceUnitId)); sysUser.setUnitId(StrUtil.blankToDefault(parentUnitId, sourceUnitId));
sysUser.setThreeUnitId(parentUnitId == null ? null : sourceUnitId); sysUser.setThreeUnitId(parentUnitId == null ? null : sourceUnitId);
@@ -261,7 +247,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
/** /**
* 规范化信息中心返回的来校时间。 * 规范化信息中心返回的来校时间。
* 入参 arrivalAtSchoolDate 对应信息中心 LXNY 字段,允许 yyyy-MM-dd 或 yyyy-MM; * 入参 arrivalAtSchoolDate 对应信息中心 LXRQ 字段,允许 yyyy-MM-dd 或 yyyy-MM;
* 返回值用于 sys_user_source.arrivalAtSchoolDate 和后续 sys_user.arrivalAtSchoolDate,年月格式统一补为当月 01 日。 * 返回值用于 sys_user_source.arrivalAtSchoolDate 和后续 sys_user.arrivalAtSchoolDate,年月格式统一补为当月 01 日。
*/ */
private String normalizeArrivalAtSchoolDate(String arrivalAtSchoolDate) { private String normalizeArrivalAtSchoolDate(String arrivalAtSchoolDate) {
@@ -373,10 +359,6 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
* 入参 url 为人员接口地址,accessToken 为信息中心令牌,sourceName 用于日志区分接口来源。 * 入参 url 为人员接口地址,accessToken 为信息中心令牌,sourceName 用于日志区分接口来源。
* 返回值为该接口所有分页合并后的原始人员 JSON 列表。 * 返回值为该接口所有分页合并后的原始人员 JSON 列表。
*/ */
private List<JSONObject> pullDmpUsers(String url, String accessToken, String sourceName) {
return pullDmpUsers(url, accessToken, sourceName, null);
}
private List<JSONObject> pullDmpUsers(String url, String accessToken, String sourceName, String zgh) { private List<JSONObject> pullDmpUsers(String url, String accessToken, String sourceName, String zgh) {
List<JSONObject> rawDataList = new ArrayList<>(); List<JSONObject> rawDataList = new ArrayList<>();
int page = 1; int page = 1;
@@ -698,7 +698,7 @@
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
应用中心 应用中心
</a> </a>
<a href="/platform/v4/serv" data-pjax class="v4-nav-item"> <!--<a href="/platform/v4/serv" data-pjax class="v4-nav-item">
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
流程中心 流程中心
</a> </a>
@@ -709,7 +709,7 @@
<a href="/platform/v4/msg" data-pjax class="v4-nav-item"> <a href="/platform/v4/msg" data-pjax class="v4-nav-item">
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
消息中心 消息中心
</a> </a>-->
</nav> </nav>
</div> </div>
@@ -1,6 +1,13 @@
<!--# <!--#
layout("/layouts/platform.html"){ layout("/layouts/platform.html"){
#--> #-->
<style>
.el-table td.member-statistics-actions > .cell {
display: flex;
justify-content: center;
padding: 0 10px;
}
</style>
<div id="app"> <div id="app">
<guava ref="guava"> <guava ref="guava">
<template> <template>
@@ -118,7 +125,7 @@ layout("/layouts/platform.html"){
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" header-align="center" label="操作" width="100px" fixed="right"> <el-table-column align="center" header-align="center" label="操作" width="100px" fixed="right" class-name="member-statistics-actions">
<template scope="{row}"> <template scope="{row}">
<el-button size="mini" @click="openView(row.id)" type="primary">查看</el-button> <el-button size="mini" @click="openView(row.id)" type="primary">查看</el-button>
</template> </template>
@@ -158,14 +165,13 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系电话", width: 120 }, { prop: "mobile", label: "联系电话", width: 120 },
{ prop: "political", label: "政治面貌", width: 120, sortable: true}, { prop: "political", label: "政治面貌", width: 120, sortable: true},
{ prop: "userState", 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: "preparedBy", label: "编制类别", width: 120, sortable: true },
{ prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 }, { prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 },
{ prop: "unionName", label: "所属工会", width: 120, sortable: true }, { prop: "unionName", label: "所属工会", width: 120, sortable: true },
{ prop: "unitName", label: "所属单位", width: 120, sortable: true }, { prop: "unitName", label: "所属单位", width: 120, sortable: true },
// 临时屏蔽“人员分类”列表字段,不删除配置,后续需要可恢复。 // 临时屏蔽“人员分类”列表字段,不删除配置,后续需要可恢复。
// { prop: "aidFundMemberUserType", 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: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 },
{ prop: "idCard", 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 }, { 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.memberTypes = JSON.stringify(this.pageForm.memberTypes)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes)
pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes)
pageForm.userStates = JSON.stringify(this.pageForm.userStates) pageForm.userStates = JSON.stringify(this.pageForm.userStates)
const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => { const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => {
return {prop: item.prop, label: item.label} return {prop: item.prop, label: item.label}
@@ -230,7 +235,6 @@ layout("/layouts/platform.html"){
pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes)
pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys) pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus) pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus)
pageForm.userStates = JSON.stringify(this.pageForm.userStates) pageForm.userStates = JSON.stringify(this.pageForm.userStates)
@@ -81,7 +81,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
@click="pageForm.personTypes=[];doSearch()">清空 @click="pageForm.personTypes=[];doSearch()">清空
</el-link> </el-link>
<el-link :underline="false" <el-link :underline="false"
@click="pageForm.personTypes=personTypeOptions.map(p=>p.code);doSearch()" @click="pageForm.personTypes=personTypeOptions.map(p=>p.name);doSearch()"
type="success">全部 type="success">全部
</el-link> </el-link>
</el-col> </el-col>
@@ -113,31 +113,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">人员属性:</el-col>
<el-col class="query-row-content query-row-content-tag">
<el-tag
style="margin-right: 10px;cursor: pointer"
v-for="item in userAttributeOptions"
:key="item.code"
:type="item.name"
:effect="pageForm.userAttributes.includes(item.code)?'dark':'plain'"
@click="tagClick('userAttributes',item.code)">
{{ item.name }}
</el-tag>
<el-link type="danger"
v-if="userAttributeOptions.length&&pageForm.userAttributes.length"
:underline="false"
@click="pageForm.userAttributes=[];doSearch()">清空
</el-link>
<el-link :underline="false"
@click="pageForm.userAttributes=userAttributeOptions.map(p=>p.code);doSearch()"
type="success">全部
</el-link>
</el-col>
</el-row>
<el-row type="flex" align="middle" class="query-row"> <el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-content"> <el-col class="query-row-content">
<el-row> <el-row>
@@ -235,7 +210,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
personTypes: [], personTypes: [],
preparedBys: [], preparedBys: [],
aidFundMemberUserTypes: [], aidFundMemberUserTypes: [],
userAttributes: [],
userStates: [], userStates: [],
memberStatus: [], memberStatus: [],
year: moment().format("YYYY"), year: moment().format("YYYY"),
@@ -253,7 +227,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
personTypeOptions: [], personTypeOptions: [],
preparedByOptions: [], preparedByOptions: [],
aidFundMemberUserTypeOptions: [], aidFundMemberUserTypeOptions: [],
userAttributeOptions: [],
userStateOptions: [], userStateOptions: [],
memberStatusOptions: [], memberStatusOptions: [],
unions: [], unions: [],
@@ -346,7 +319,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
this.pageForm.personTypes = [] this.pageForm.personTypes = []
this.pageForm.preparedBys = [] this.pageForm.preparedBys = []
this.pageForm.aidFundMemberUserTypes = [] this.pageForm.aidFundMemberUserTypes = []
this.pageForm.userAttributes = []
this.pageForm.memberStatus = [] this.pageForm.memberStatus = []
this.pageForm.userStates = [] this.pageForm.userStates = []
this.pageForm.unionId = [] this.pageForm.unionId = []
@@ -387,9 +359,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
this.$businessTool.getDictOptions("AIDFUND_MEMBER_USER_TYPE").then((data) => { this.$businessTool.getDictOptions("AIDFUND_MEMBER_USER_TYPE").then((data) => {
this.aidFundMemberUserTypeOptions = data this.aidFundMemberUserTypeOptions = data
}) })
this.$businessTool.getDictOptions("USER_ATTRIBUTE").then((data) => {
this.userAttributeOptions = data
})
this.$businessTool.getDictOptions("USER_STATE").then((data) => { this.$businessTool.getDictOptions("USER_STATE").then((data) => {
this.userStateOptions = data this.userStateOptions = data
}) })