Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4

src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolApply.java

@@ -169,16 +169,16 @@ public class ActivitySchoolApply extends BaseModel implements Serializable {
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String mobile;
 
+//    @Excel(name = "身份证号", width = 20)
+    @Excel(name = "身份证", width = 25)
+    private String idCard;
+
     @Column
     @Comment("职级")
     @Excel(name = "职级", width = 20)
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String professionalLevel;
 
-
-//    @Excel(name = "身份证号", width = 20)
-    private String idCard;
-
     @Column
     @Comment("性别")
     @Excel(name = "性别", width = 20)

src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java

@@ -10,6 +10,7 @@ import com.budwk.app.base.utils.DateUtil;
 import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
+import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnion;
 import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
 import com.budwk.app.zhgh.activity.sports.models.ActivitySchool;
 import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolApply;
@@ -200,6 +201,7 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
                      	app.activityUnionName unionname,
                      	app.sex,
                      	app.mobile,
+                        u.idcard AS idCard,
                      	app.professionalLevel,
                      	u.userState,
                         ev.allName,
@@ -244,13 +246,25 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.XSSF);
             Workbook workbook = ExcelExportUtil.exportExcel(exportParams, ActivitySchoolApply.class, excels);
-            CommonDownloadUtil.download("报名表.xlsx", workbook, response);
+            CommonDownloadUtil.download(getUnionApplyExportFileName(unionId), workbook, response);
         } catch (Exception e) {
             e.printStackTrace();
         }
 
     }
 
+    private String getUnionApplyExportFileName(String unionId) {
+        String unionName = "分工会";
+        if (Strings.isNotBlank(unionId)) {
+            ActivityBasicUnion union = dao().fetch(ActivityBasicUnion.class, unionId);
+            if (union != null && Strings.isNotBlank(union.getName())) {
+                unionName = union.getName();
+            }
+        }
+        // 分工会名称可能已经包含“分工会”后缀，避免导出文件名重复拼接。
+        return unionName.endsWith("分工会") ? unionName + "报名表.xlsx" : unionName + "分工会报名表.xlsx";
+    }
+
 
     private static class personType {
 

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java

@@ -135,6 +135,7 @@ public class TrainSignUpApplyController {
 					tsuc.courseLocationCoordinates,
 					tsuc.courseReservedNumber,
 					tsuc.courseInstructor,
+					tsuc.courseInstructorMobile,
 					tsuc.campus,
 					tsuc.unionLimit,
 					tsuc.isMobileSign,

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpCourse.java

@@ -68,6 +68,11 @@ public class TrainSignUpCourse extends BaseModel implements Serializable {
     @Comment("课程讲师")
     private String courseInstructor;
 
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("负责人手机号")
+    private String courseInstructorMobile;
+
     @Column
     @ColDefine(type = ColType.VARCHAR, width = 32)
     @Comment("校区")