From 6b892bb0261b83ae83919eb24892f874d7b8dd32 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Sun, 14 Jun 2026 17:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=97=E4=BC=91=E5=85=BB=E4=BC=98=E5=8C=961.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TourSchoolUserAssignmentController.java | 6 ++-- .../tour/controller/TourSignupController.java | 21 ++++++++++- .../service/TourUserAssignmentService.java | 3 +- .../impl/TourUserAssignmentServiceImpl.java | 7 ++-- .../Tour/schoolUserAssignment/index.html | 35 +++++++++++++++++-- .../dayofficework/tour/signup/lineInfo.html | 2 +- 6 files changed, 63 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSchoolUserAssignmentController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSchoolUserAssignmentController.java index df99b13d..129afd82 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSchoolUserAssignmentController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSchoolUserAssignmentController.java @@ -39,14 +39,14 @@ public class TourSchoolUserAssignmentController { } /** - * 分页查询校工会分配记录，列表数据只来自人员分配表。 + * 分页查询人员分配记录，列表数据只来自人员分配表，默认由前端传入校工会分配类别。 */ @At @SaCheckPermission("tour.schoolUserAssignment") public Result pageData(PageForm pageForm, Integer year, String settingId, String matterId, String unionId, - String personType, String keyword) { + String personType, String keyword, String assignSource) { return Result.success(tourUserAssignmentService.schoolAssignmentPage(pageForm, year, settingId, matterId, - unionId, personType, keyword)); + unionId, personType, keyword, assignSource)); } /** diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java index fd80e9ba..a4c412c5 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java @@ -522,12 +522,31 @@ public class TourSignupController { IFNULL(lot.allowOverReimbursement, 0) AS allowOverReimbursement, s.allowFamily, IFNULL(s.fillBedInfo, 1) AS fillBedInfo, - s.boardingPlace AS boardingPlaceOptions + s.boardingPlace AS boardingPlaceOptions, + IFNULL(sc.signupCount, 0) AS signupCount, + IFNULL(sc.familyCount, 0) AS familyCount FROM tour_matter m INNER JOIN tour_line l ON l.id = m.lineId LEFT JOIN tour_travel_agency a ON a.id = l.travelAgencyId LEFT JOIN tour_setting_lot lot ON lot.id = l.lotId LEFT JOIN tour_setting s ON s.id = m.settingId + LEFT JOIN ( + SELECT + t.matterId, + COUNT(1) + SUM(IFNULL(f.familyCount, 0)) AS signupCount, + SUM(IFNULL(f.familyCount, 0)) AS familyCount + FROM tour_ledger t + LEFT JOIN ( + SELECT ledgerId, COUNT(1) AS familyCount + FROM tour_ledger_family + WHERE delFlag = 0 + GROUP BY ledgerId + ) f ON f.ledgerId = t.id + WHERE t.delFlag = 0 + AND t.matterId IS NOT NULL + AND t.matterId <> '' + GROUP BY t.matterId + ) sc ON sc.matterId = m.id WHERE m.delFlag = 0 AND m.enabled = 1 AND m.id = @matterId diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/TourUserAssignmentService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/TourUserAssignmentService.java index 52c953a2..cf2c9dc2 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/TourUserAssignmentService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/TourUserAssignmentService.java @@ -20,10 +20,11 @@ public interface TourUserAssignmentService extends BaseService schoolAssignmentPage(PageForm pageForm, Integer year, String settingId, String matterId, - String unionId, String personType, String keyword); + String unionId, String personType, String keyword, String assignSource); /** * 分页查询校工会可分配候选人，候选人来自疗休养配置的可参加人员范围，并排除同一配置下已分配人员。 diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/impl/TourUserAssignmentServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/impl/TourUserAssignmentServiceImpl.java index d41460f0..cb8fae2b 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/impl/TourUserAssignmentServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/service/impl/TourUserAssignmentServiceImpl.java @@ -45,7 +45,7 @@ public class TourUserAssignmentServiceImpl extends BaseServiceImpl schoolAssignmentPage(PageForm pageForm, Integer year, String settingId, String matterId, - String unionId, String personType, String keyword) { + String unionId, String personType, String keyword, String assignSource) { Sql sql = Sqls.create(""" SELECT a.*, @@ -63,7 +63,8 @@ public class TourUserAssignmentServiceImpl extends BaseServiceImpl + + + + + + + +