From 16b24454f6d7ff3ee67ecbfbacda7e93649e2e48 Mon Sep 17 00:00:00 2001 From: server Date: Fri, 19 Sep 2025 17:08:29 +0800 Subject: [PATCH 1/2] .. --- .../WelfareStatisticsController.java | 3 ++- src/test/java/com/budwk/app/JugTest.java | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java index 40e8835..29a3641 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java @@ -213,7 +213,8 @@ public class WelfareStatisticsController { @Ok("void") @SaCheckPermission("welfare.statistics") public void exportSummary(String projectId, String unionId, HttpServletResponse response) { - welfareSingleService.exportSummary(projectId, unionId, response); +// welfareSingleService.exportSummary(projectId, unionId, response); + welfareStatisticsService.exportSummary(projectId,response); } @At diff --git a/src/test/java/com/budwk/app/JugTest.java b/src/test/java/com/budwk/app/JugTest.java index 5dc2036..8641514 100644 --- a/src/test/java/com/budwk/app/JugTest.java +++ b/src/test/java/com/budwk/app/JugTest.java @@ -39,6 +39,8 @@ import org.nutz.boot.test.junit4.NbJUnit4Runner; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; @@ -325,11 +327,24 @@ public class JugTest { dao.insert(user_role); } + } + @Test + public void test00001(){ + Sql sql = Sqls.create("SELECT id FROM `sys_user` where id not in (select userId from sys_user_role where roleId = '65195ad8f52c4d7d8864624e583b801b')"); + sql.setCallback(Sqls.callback.strList()); + dao.execute(sql); + List list = sql.getList(String.class); - - + List userRoles = new ArrayList<>(); + for (String id : list) { + Sys_user_role userRole = new Sys_user_role(); + userRole.setRoleId("65195ad8f52c4d7d8864624e583b801b"); + userRole.setUserId(id); + userRoles.add(userRole); + } + dao.insert(userRoles); } } From f37ee94696f2ccf43081e6c9534dd41e148f16a9 Mon Sep 17 00:00:00 2001 From: server Date: Fri, 19 Sep 2025 17:45:43 +0800 Subject: [PATCH 2/2] .. --- .../school/MemberSchoolUnionManageController.java | 1 + .../service/impl/MemberManageServiceImpl.java | 2 +- .../staffmanage/member/common/info/memberInfo.js | 2 +- .../member/common/manage/memberManageTable.js | 2 +- .../views/platform/zhghh5/sys/userInfo/index.html | 14 +++++++------- src/test/java/com/budwk/app/JugTest.java | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) 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);