From 2911ff415a3c0b9ebfb07804bae57d801a794770 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 7 Apr 2025 14:32:43 +0800 Subject: [PATCH] commit --- .../controller/union/ActivityUnionManageController.java | 4 +++- .../union/ActivityUnionUserStatisticsController.java | 4 +++- .../platform/activity/union/layoutStatisticsActivity.html | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java index 77744fb..8b99cf1 100644 --- a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java +++ b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java @@ -305,10 +305,12 @@ public class ActivityUnionManageController { u.unionname, u.sex, u.mobile, - atp.applyDateTime + atp.applyDateTime, + u2.username applyUserName FROM `activity_tissue_person` atp LEFT JOIN `user` u ON u.id = atp.userId + LEFT JOIN sys_user u2 ON u2.id=applyUserId $condition """); Cnd cnd = Cnd.NEW(); diff --git a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionUserStatisticsController.java b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionUserStatisticsController.java index 16f7266..557235b 100644 --- a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionUserStatisticsController.java +++ b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionUserStatisticsController.java @@ -97,10 +97,12 @@ public class ActivityUnionUserStatisticsController { u.mobile, atp.applyUserId, atp.id atpId , - atp.applyDateTime + atp.applyDateTime, + u2.username applyUserName FROM `activity_tissue_person` atp LEFT JOIN `user` u ON u.id = atp.userId + LEFT JOIN sys_user u2 ON u2.id=applyUserId $condition """); Cnd cnd = Cnd.NEW(); diff --git a/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html b/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html index 45030bb..a017211 100644 --- a/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html +++ b/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html @@ -136,7 +136,8 @@ {prop: 'mobile', label: '联系方式'}, {prop: 'unitname', label: '所属单位'}, {prop: 'unionname', label: '所属工会'}, - {prop: 'applyDateTime', label: '报名时间'} + {prop: 'applyDateTime', label: '报名时间'}, + {prop: 'applyUserName', label: '报名人'} ], } },