diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java index 33714e3..a9299e3 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java @@ -153,6 +153,7 @@ public class MemberSchoolUnionManageController { exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); exportEntities.add(new ExcelExportEntity("出生年月", "birthday", 20)); exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); + exportEntities.add(new ExcelExportEntity("福利号码", "welfareMobile", 20)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20)); exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java index 4a50c24..5ab8aba 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java @@ -76,7 +76,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement u.unitName, u.unionId, u.unionName, - u.birthday, + DATE_FORMAT(u.birthday, '%Y-%m-%d ') as birthday, u.manyUnit, u.member, u.userState, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js index 3d05c98..7c7f013 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js @@ -24,6 +24,7 @@ $moment(viewData.retireDate).format('YYYY-MM-DD') : null }} {{ viewData.mobile }} + {{ viewData.welfareMobile }} {{ viewData.email }} @@ -35,7 +36,6 @@ {{ viewData.unitName }} {{ viewData.unionName }} - {{ viewData.welfareMobile }}
学历信息
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js index 829ebfd..342c96e 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js @@ -123,7 +123,7 @@ const MEMBER_MANAGE_TABLE = { + v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN'])"> 修改福利号码 diff --git a/src/main/resources/views/platform/zhghh5/sys/userInfo/index.html b/src/main/resources/views/platform/zhghh5/sys/userInfo/index.html index 3bdfc50..d85e674 100644 --- a/src/main/resources/views/platform/zhghh5/sys/userInfo/index.html +++ b/src/main/resources/views/platform/zhghh5/sys/userInfo/index.html @@ -32,13 +32,6 @@ layout("/layouts/platform_h5.html"){ - - - - - {{formData.member === 1 ? '是' : '否'}} - {{ formData.unitName }} - {{ formData.unionName }} {{ formData.welfareMobile || '暂无' }} @@ -47,6 +40,13 @@ layout("/layouts/platform_h5.html"){ + + + + + {{formData.member === 1 ? '是' : '否'}} + {{ formData.unitName }} + {{ formData.unionName }} diff --git a/src/test/java/com/budwk/app/JugTest.java b/src/test/java/com/budwk/app/JugTest.java index 6e3c3c2..acca3cb 100644 --- a/src/test/java/com/budwk/app/JugTest.java +++ b/src/test/java/com/budwk/app/JugTest.java @@ -339,7 +339,7 @@ public class JugTest { @Test public void importWelfareMobile() { try { - File file = new File("C:\\Users\\jug\\Desktop\\副本2025年南师大端午发放清单0915.xlsx"); + File file = new File("C:\\Users\\administrator\\Desktop\\副本2025年南师大端午发放清单0915.xlsx"); ImportParams params = new ImportParams(); List list = ExcelImportUtil.importExcel(file, User.class, params);