From 0effb78ef19b9823eaff86d237defa315ba8123b Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Sun, 19 Oct 2025 16:50:48 +0800 Subject: [PATCH] commit --- .../controller/manage/FamilyActivityApplyController.java | 2 +- .../family/controller/manage/FamilyUserManageController.java | 3 +++ .../controller/manage/TrainSignUpApplyController.java | 2 +- .../controller/manage/TrainSignUpUserManageController.java | 3 +++ .../literacy/controller/manage/LiteracyApplyController.java | 2 +- .../controller/manage/LiteracyUserManageController.java | 3 +++ src/main/resources/static/assets/platform/css/common.css | 2 +- .../platform/zhgh/activity/family/userAdjust/userInfo.js | 1 - .../views/platform/zhgh/activity/family/userManage/index.html | 4 ++-- .../platform/zhgh/activity/trainSignUp/userManage/index.html | 4 ++-- .../zhgh/dayofficework/literacy/userAdjust/userInfo.js | 1 - .../zhgh/dayofficework/literacy/userManage/index.html | 4 ++-- 12 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java index 279c27c8..36c0cca9 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java @@ -204,7 +204,7 @@ public class FamilyActivityApplyController { if(Lang.isEmpty(courseList)) { return Result.success(new ArrayList<>()); } - List assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).toList(); + List assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList(); return Result.success(assortList); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserManageController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserManageController.java index 74bbeef3..aaba3e14 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserManageController.java @@ -210,6 +210,9 @@ public class FamilyUserManageController { excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22)); for (FamilyCourse c : courseList) { + if(!c.isMobileSign()) { + continue; + } String courseId = c.getId(); String courseName = c.getCourseName(); List v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java index 5e043ad6..5a0dce09 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java @@ -208,7 +208,7 @@ public class TrainSignUpApplyController { if (Lang.isEmpty(courseList)) { return Result.success(new ArrayList<>()); } - List assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).toList(); + List assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList(); return Result.success(assortList); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java index 5b3a7656..ec712120 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java @@ -208,6 +208,9 @@ public class TrainSignUpUserManageController { excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22)); for (TrainSignUpCourse c : courseList) { + if(!c.isMobileSign()) { + continue; + } String courseId = c.getId(); String courseName = c.getCourseName(); List v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyApplyController.java index 3091a2d7..e77d1065 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyApplyController.java @@ -208,7 +208,7 @@ public class LiteracyApplyController { if (Lang.isEmpty(courseList)) { return Result.success(new ArrayList<>()); } - List assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).toList(); + List assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList(); return Result.success(assortList); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyUserManageController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyUserManageController.java index 961a2460..0751e9c1 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyUserManageController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyUserManageController.java @@ -208,6 +208,9 @@ public class LiteracyUserManageController { excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22)); for (LiteracyCourse c : courseList) { + if(!c.isMobileSign()) { + continue; + } String courseId = c.getId(); String courseName = c.getCourseName(); List v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList()); diff --git a/src/main/resources/static/assets/platform/css/common.css b/src/main/resources/static/assets/platform/css/common.css index 72fc3ba5..87a3f625 100644 --- a/src/main/resources/static/assets/platform/css/common.css +++ b/src/main/resources/static/assets/platform/css/common.css @@ -553,7 +553,7 @@ td.no-b { } .el-transfer__buttons { - width: 200px; + /*width: 200px;*/ text-align: center; } diff --git a/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js b/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js index 555435b5..dad7f9c5 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js +++ b/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js @@ -51,7 +51,6 @@ const userInfo = {