feat: 优化人员拉取和数据字典部分

src/main/java/com/budwk/app/sys/models/Sys_user.java

@@ -98,6 +98,7 @@ public class Sys_user extends BaseModel implements Serializable {
     @Column
     @Comment("证件类型")
     @ColDefine(type = ColType.VARCHAR, width = 30)
+    @DataCenterColumn(name = "证件类型", key = "SFZJLXDM", dict = "USER_ID_CARD_TYPE")
     private String idCardType;
 
     @Column
@@ -133,8 +134,15 @@ public class Sys_user extends BaseModel implements Serializable {
     @Column
     @Comment("岗位类别")
     @ColDefine(type = ColType.VARCHAR, width = 50)
+    @DataCenterColumn(name = "聘岗类型", key = "ZYJSGWLBDMMC")
     private String jobCategory;
 
+    @Column
+    @Comment("聘岗类型代码")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @DataCenterColumn(name = "聘岗类型代码", key = "ZYJSGWLBDM")
+    private String jobCategoryCode;
+
     @Column
     @Comment("职称")
     @ColDefine(type = ColType.VARCHAR, width = 50)
@@ -222,11 +230,17 @@ public class Sys_user extends BaseModel implements Serializable {
     private Integer pendingConfirmStatus;
 
     @Column
-    @Comment("编制类别码")
+    @Comment("编制类别")
     @ColDefine(type = ColType.VARCHAR, width = 30)
     @DataCenterColumn(name = "编制类别", key = "BZLBDMMC")
     private String preparedBy;
 
+    @Column
+    @Comment("编制类别代码")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @DataCenterColumn(name = "编制类别代码", key = "BZLBDM")
+    private String preparedByCode;
+
     @Column
     @Comment("从教年月")
     @ColDefine(type = ColType.DATE)
@@ -295,6 +309,7 @@ public class Sys_user extends BaseModel implements Serializable {
     @Comment("是否双肩挑")
     @ColDefine(type = ColType.BOOLEAN)
     @Default(value = "0")
+    @DataCenterColumn(name = "是否双肩挑", key = "SFSJT")
     private Boolean manyUnit;
 
     @Column

src/main/java/com/budwk/app/sys/models/Sys_user_source.java

@@ -1,5 +1,6 @@
 package com.budwk.app.sys.models;
 
+import com.budwk.app.sys.annotation.DataCenterColumn;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -31,6 +32,18 @@ public class Sys_user_source extends Sys_user {
     @ColDefine(type = ColType.VARCHAR, width = 255)
     private String unitName;
 
+    @Column
+    @Comment("最高学历名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @DataCenterColumn(name = "最高学历名称", key = "ZGXLMC")
+    private String educationDesc;
+
+    @Column
+    @Comment("最高学位名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @DataCenterColumn(name = "最高学位名称", key = "ZGXWMC")
+    private String academicDegreeDesc;
+
     @Column
     @Comment("拉取时间")
     @ColDefine(type = ColType.DATETIME)

src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java

@@ -98,7 +98,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
             synchronized (SysDataUserPullServiceImpl.class) {
                 if (fieldMappings == null) {
                     List<FieldMapping> mappings = new ArrayList<>();
-                    Field[] fields = Sys_user.class.getDeclaredFields();
+                    Field[] fields = cn.hutool.core.util.ReflectUtil.getFields(Sys_user_source.class);
                     for (Field field : fields) {
                         DataCenterColumn annotation = field.getAnnotation(DataCenterColumn.class);
                         if (annotation != null) {
@@ -200,6 +200,8 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
                                     mapping.field.set(sysUser, raw.getStr(mapping.key));
                                 }
                             }
+                        } else if (mapping.field.getType() == Boolean.class) {
+                            mapping.field.set(sysUser, raw.getBool(mapping.key));
                         } else if (mapping.field.getType() == Date.class) {
                             String dateText = StrUtil.trim(raw.getStr(mapping.key));
                             if (StrUtil.isNotBlank(dateText)) {

src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberHistory.java

@@ -25,6 +25,26 @@ public class MemberHistory extends Sys_user {
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String id;
 
+    @Column
+    @Comment("编制类别")
+    @ColDefine(type = ColType.TEXT)
+    private String preparedBy;
+
+    @Column
+    @Comment("编制类别代码")
+    @ColDefine(type = ColType.TEXT)
+    private String preparedByCode;
+
+    @Column
+    @Comment("岗位类别")
+    @ColDefine(type = ColType.TEXT)
+    private String jobCategory;
+
+    @Column
+    @Comment("聘岗类型代码")
+    @ColDefine(type = ColType.TEXT)
+    private String jobCategoryCode;
+
     @Column
     @Comment("年度")
     @ColDefine(type = ColType.INT, width = 4)

src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html

@@ -851,7 +851,10 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
                         cancelButtonText: '取消',
                         type: 'warning'
                     }).then(async () => {
-                        window.top.location.href = '/platform/inclusiveTherapyV3/lineXghSelect?mode=2'
+                        const targetMenu = window.parent.document.querySelector('#sidebar-menu a[data-pjax][href="/platform/inclusiveTherapyV3/lineXghSelect?mode=2"]')
+                        if (targetMenu) {
+                            targetMenu.click()
+                        }
                     }).catch(() => {
                         this.$refs.guava.index()
                         this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html

@@ -32,6 +32,11 @@ ELEMENT.Table.props.border.default = true;
 ELEMENT.TableColumn.props.headerAlign.default = 'center';
 ELEMENT.TableColumn.props.align.default = 'center';
 Vue.use(ELEMENT, {zIndex: 20000});
+if (window.parent !== window) {
+    Vue.prototype.$confirm = function(...args) {
+        return window.parent.ELEMENT.MessageBox.confirm(...args);
+    };
+}
 </script>
 <script src="${base!}/assets/platform/plugins/wangEditor4/wangEditor.js"></script>
 <script src="${base!}/assets/platform/plugins/sortablejs/sortable.min.js"></script>