From 8b5de6b1960cd2b2d0263439befbc896e8edb785 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Wed, 1 Jul 2026 18:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E5=A4=A7=E4=B8=89=E5=8D=81=E5=B9=B4?= =?UTF-8?q?=E6=95=99=E8=81=8C=E5=B7=A5=E7=96=97=E4=BC=91=E5=85=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...achTourBranchUserAssignmentController.java | 4 +-- ...achTourSchoolUserAssignmentController.java | 6 ++-- .../ThirtyTeachTourUserAssignmentService.java | 14 ++++----- .../ThirtyTeachTourLeaveApplyServiceImpl.java | 2 +- ...rtyTeachTourUserAssignmentServiceImpl.java | 30 +++++++++---------- .../branchUserAssignment/index.html | 22 +++++++------- .../schoolUserAssignment/index.html | 24 +++++++-------- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourBranchUserAssignmentController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourBranchUserAssignmentController.java index 10d45d5a..cb9085fe 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourBranchUserAssignmentController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourBranchUserAssignmentController.java @@ -96,7 +96,7 @@ public class ThirtyTeachTourBranchUserAssignmentController { } /** - * 查询分工会可分配线路选项,选项携带事项、线路和旅行社快照信息。 + * 查询分工会可分配批次选项,选项携带事项、线路和旅行社快照信息。 */ @At @SaCheckPermission("thirtyTeachTour.branchUserAssignment") @@ -184,7 +184,7 @@ public class ThirtyTeachTourBranchUserAssignmentController { } /** - * 给当前分工会已分配正式人员补选分配路线,具体快照回写、代报名和最大成团人数校验由 service 统一处理。 + * 给当前分工会已分配正式人员补选分配批次,具体快照回写、代报名和最大成团人数校验由 service 统一处理。 */ @At @Aop(TransAop.READ_COMMITTED) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourSchoolUserAssignmentController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourSchoolUserAssignmentController.java index a4f4b1b7..44bfb14a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourSchoolUserAssignmentController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/controller/ThirtyTeachTourSchoolUserAssignmentController.java @@ -122,7 +122,7 @@ public class ThirtyTeachTourSchoolUserAssignmentController { } /** - * 查询校工会可分配线路选项,选项携带事项、线路和旅行社快照信息。 + * 查询校工会可分配批次选项,选项携带事项、线路和旅行社快照信息。 */ @At @SaCheckPermission("thirtyTeachTour.schoolUserAssignment") @@ -172,7 +172,7 @@ public class ThirtyTeachTourSchoolUserAssignmentController { } /** - * 保存校工会人员分配明细,支持弹窗候选列表中每个人单独选择分配线路。 + * 保存校工会人员分配明细,支持弹窗候选列表中每个人单独选择分配批次。 */ @At @Aop(TransAop.READ_COMMITTED) @@ -193,7 +193,7 @@ public class ThirtyTeachTourSchoolUserAssignmentController { } /** - * 给校工会已分配人员补选分配线路,具体回写分配表和写台账逻辑由 service 统一处理。 + * 给校工会已分配人员补选分配批次,具体回写分配表和写台账逻辑由 service 统一处理。 */ @At @Aop(TransAop.READ_COMMITTED) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/ThirtyTeachTourUserAssignmentService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/ThirtyTeachTourUserAssignmentService.java index ab842784..1b440480 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/ThirtyTeachTourUserAssignmentService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/ThirtyTeachTourUserAssignmentService.java @@ -131,7 +131,7 @@ public interface ThirtyTeachTourUserAssignmentService extends BaseService listEnabledSettingOptions(Integer year); /** - * 查询指定配置下已配置线路的分配线路选项,用于人员分配时指定事项、线路和旅行社。 + * 查询指定配置下已配置线路的分配批次选项,用于人员分配时指定事项、线路和旅行社。 * * @param settingId 疗休养配置ID * @return 事项选项列表 @@ -139,7 +139,7 @@ public interface ThirtyTeachTourUserAssignmentService extends BaseService listMatterOptions(String settingId); /** - * 查询指定配置下当前处于报名时间内的分配线路选项,供分工会人员选择线路时使用。 + * 查询指定配置下当前处于报名时间内的分配批次选项,供分工会人员选择线路时使用。 * * @param settingId 疗休养配置ID * @return 当前报名时间内的事项选项列表 @@ -155,7 +155,7 @@ public interface ThirtyTeachTourUserAssignmentService extends BaseService userIds, String photoFiles, String currentPeriodPhotoFiles); /** - * 保存校工会人员分配,支持每个候选人员单独选择分配线路。 + * 保存校工会人员分配,支持每个候选人员单独选择分配批次。 * assignItems 中每项包含 userId、matterId、photoFiles、currentPeriodPhotoFiles;matterId 为空时只保存人员分配,不写台账。 * * @param settingId 疗休养配置ID - * @param assignItems 人员和分配线路明细 + * @param assignItems 人员和分配批次明细 * @return 保存结果,包含实际分配数量、跳过数量和代报名台账写入数量 */ NutMap assignSchoolUsers(String settingId, List assignItems); /** - * 给校工会已分配的正式人员补选分配线路,并按代报名写入疗休养台账。 + * 给校工会已分配的正式人员补选分配批次,并按代报名写入疗休养台账。 * 只处理 SCHOOL_UNION 来源且尚未选择线路的分配记录,避免覆盖既有台账。 * * @param id 人员分配记录ID @@ -186,7 +186,7 @@ public interface ThirtyTeachTourUserAssignmentService extends BaseService", ""); cnd.and("a.lineId", "is not", null); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/impl/ThirtyTeachTourUserAssignmentServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/impl/ThirtyTeachTourUserAssignmentServiceImpl.java index 5db61826..ddfda756 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/impl/ThirtyTeachTourUserAssignmentServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/thirtyTeachTour/service/impl/ThirtyTeachTourUserAssignmentServiceImpl.java @@ -386,7 +386,7 @@ public class ThirtyTeachTourUserAssignmentServiceImpl extends BaseServiceImpl { NutMap matterInfo = fetchMatterInfo(settingId, matterId); if (matterInfo == null) { - throw new IllegalArgumentException("分配线路不存在或未配置线路"); + throw new IllegalArgumentException("分配批次不存在或未配置线路"); } matterInfoMap.put(matterId, matterInfo); }); @@ -483,7 +483,7 @@ public class ThirtyTeachTourUserAssignmentServiceImpl extends BaseServiceImpl - - + + @@ -135,7 +135,7 @@ layout("/layouts/platform.html"){ - + @@ -225,7 +225,7 @@ layout("/layouts/platform.html"){ - +