移植体育活动组队报名

src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java

@@ -22,12 +22,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.nutz.aop.interceptor.async.Async;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
-import org.nutz.dao.entity.Record;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
 import org.nutz.lang.Strings;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
@@ -239,7 +239,6 @@ public class ActivityApplyController {
         Sql applySql = Sqls.create("""
                 SELECT
                 	asa.*
-                	
                 FROM
                 	activity_school_apply asa
                 	LEFT JOIN activity_school_team team ON asa.teamId = team.id
@@ -261,8 +260,9 @@ public class ActivityApplyController {
 
         list.forEach(v -> {
             if (Strings.isNotBlank(v.getString("birthday"))) {
-                v.setv("birthday",cn.hutool.core.date.DateUtil.ageOfNow(v.getString("birthday")));
+                v.setv("age", cn.hutool.core.date.DateUtil.ageOfNow(v.getString("birthday")));
             }
+            v.setv("identity", Json.fromJsonAsList(String.class, v.getString("identity")));
         });
 
         result.put("list", list);
@@ -871,5 +871,4 @@ public class ActivityApplyController {
     }
 
 
-
 }

src/main/java/io/v/nutz/data/controller/UpdateUserController.java

@@ -3,7 +3,6 @@ package io.v.nutz.data.controller;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import cn.hutool.core.lang.Assert;
 import io.v.nutz.annontation.ViReturn;
 import io.v.nutz.dao.CndPlus;
 import io.v.nutz.data.constant.UserChangeType;
@@ -12,9 +11,7 @@ import io.v.nutz.data.service.SourceUserService;
 import io.v.nutz.modules.models.PageForm;
 import io.v.nutz.util.ViTool;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jetbrains.annotations.NotNull;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
@@ -83,7 +80,7 @@ public class UpdateUserController {
 
         cnd.andExcludeEmpty("Date(his.changeTime)", "=", changeDate);
         cnd.andExcludeEmpty("his.changeType", "=", changeType);
-
+        cnd.asc("u.loginname");
         sql.setCondition(cnd);
 
         return historyUserService.list(pageForm, sql);

src/main/resources/views/platform/activity/school/ActivityApply.html

@@ -1819,6 +1819,14 @@ layout("/layouts/platform.html"){
 
                     const appliedData = clone(this.appliedData)
 
+                    const unionNameAppliedData = groupBy(appliedData, (v) => {
+                        return v.unionName
+                    })
+                    if (unionNameAppliedData && unionNameAppliedData.length > 2) {
+                        this.notifyWarning('最多只能两个工会联合组队！')
+                        return
+                    }
+
                     const teamAppliedData = groupBy(appliedData, (v) => {
                         return v.teamId
                     })
@@ -1946,6 +1954,7 @@ layout("/layouts/platform.html"){
             },
 
             async delApplyed(index, row, num) {
+                console.log(row)
                 if (row.identity.length == 1) {
                     this.$set(row, "loading", true)
                     const user = this.applyUsers.find(v => {