commit

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<String> assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).toList();
+		List<String> assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
 		return Result.success(assortList);
 	}
 

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<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());

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<String> assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).toList();
+		List<String> assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
 		return Result.success(assortList);
 	}
 

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<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());

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<String> assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).toList();
+		List<String> assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
 		return Result.success(assortList);
 	}
 

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<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());

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;
 }
 

src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js

@@ -51,7 +51,6 @@ const userInfo = {
                     <el-table-column label="单选" width="160">
                         <template v-slot="{row}">
                             <el-radio
-                                    :label="row.id"
                                     @change.native="getCurrentRow(row)"
                                     :disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
                                     v-model="afterAdjustCourse"

src/main/resources/views/platform/zhgh/activity/family/userManage/index.html

@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
                     { label: "姓名", prop: "username" },
                     { label: "工号", prop: "loginname" },
                     { label: "联系方式", prop: "mobile" },
-                    { label: "单位", prop: "unitName", sortable: true },
+                    { label: "单位", prop: "unitname", sortable: true },
-                    { label: "分工会", prop: "unionName", sortable: true },
+                    { label: "分工会", prop: "unionname", sortable: true },
                     { label: "课程", prop: "courseNames", sortable: true },
                     { label: "缺席次数", prop: "absentCount" },
                     { label: "是否黑名单", prop: "isDisabled", sortable: true }

src/main/resources/views/platform/zhgh/activity/trainSignUp/userManage/index.html

@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
                     { label: "姓名", prop: "username" },
                     { label: "工号", prop: "loginname" },
                     { label: "联系方式", prop: "mobile" },
-                    { label: "单位", prop: "unitName", sortable: true },
+                    { label: "单位", prop: "unitname", sortable: true },
-                    { label: "分工会", prop: "unionName", sortable: true },
+                    { label: "分工会", prop: "unionname", sortable: true },
                     { label: "课程", prop: "courseNames", sortable: true },
                     { label: "缺席次数", prop: "absentCount" },
                     { label: "是否黑名单", prop: "isDisabled", sortable: true }

src/main/resources/views/platform/zhgh/dayofficework/literacy/userAdjust/userInfo.js

@@ -51,7 +51,6 @@ const userInfo = {
                     <el-table-column label="单选" width="160">
                         <template v-slot="{row}">
                             <el-radio
-                                    :label="row.id"
                                     @change.native="getCurrentRow(row)"
                                     :disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
                                     v-model="afterAdjustCourse"

src/main/resources/views/platform/zhgh/dayofficework/literacy/userManage/index.html

@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
                     { label: "姓名", prop: "username" },
                     { label: "工号", prop: "loginname" },
                     { label: "联系方式", prop: "mobile" },
-                    { label: "所属工会", prop: "unionName", sortable: true },
+                    { label: "所属工会", prop: "unionname", sortable: true },
-                    { label: "所属单位", prop: "unitName", sortable: true },
+                    { label: "所属单位", prop: "unitname", sortable: true },
                     { label: "课程", prop: "courseNames", sortable: true },
                     { label: "缺席次数", prop: "absentCount" },
                     { label: "是否黑名单", prop: "isDisabled", sortable: true }