diff --git a/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java index d4bd182..012f4c6 100644 --- a/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java +++ b/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); @@ -361,11 +361,11 @@ public class ActivityApplyController { @At @ViReturn @RequiresPermissions("activity.apply") - public Object doApply(@Param(value = "data",required = false) ActivitySchoolApply[] applies, - @Param(value = "appliedData3",required = false) ActivitySchoolApply[] applies2, - @Param(value = "eventId",required = false) String eventId, + public Object doApply(@Param(value = "data", required = false) ActivitySchoolApply[] applies, + @Param(value = "appliedData3", required = false) ActivitySchoolApply[] applies2, + @Param(value = "eventId", required = false) String eventId, @Param(value = "activityId") String activityId, - @Param(value = "pass",required = false)boolean pass) { + @Param(value = "pass", required = false) boolean pass) { Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); Sys_unit unit = user.getUnit(); ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", unit.getId())); @@ -871,5 +871,4 @@ public class ActivityApplyController { } - } diff --git a/src/main/java/io/v/nutz/data/controller/UpdateUserController.java b/src/main/java/io/v/nutz/data/controller/UpdateUserController.java index f1d39a7..b1330cf 100644 --- a/src/main/java/io/v/nutz/data/controller/UpdateUserController.java +++ b/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); @@ -130,9 +127,9 @@ public class UpdateUserController { public Object update(String sourceTime, String sourceType, @Param(value = "columnNames", required = false) String[] columnNames, @Param(value = "isUpSet", required = false) String isUpSet, - @Param(value = "partGroupId",required = false)String partGroupId, - @Param(value = "isInvert",required = false) boolean isInvert) { - sourceUserService.updateSysUser(sourceTime, sourceType, columnNames, isUpSet,partGroupId,isInvert); + @Param(value = "partGroupId", required = false) String partGroupId, + @Param(value = "isInvert", required = false) boolean isInvert) { + sourceUserService.updateSysUser(sourceTime, sourceType, columnNames, isUpSet, partGroupId, isInvert); return null; } @@ -147,8 +144,8 @@ public class UpdateUserController { @At @Ok("void") - public void exportChangePeo(@Param(value = "searchName",required = false)String searchName, - @Param(value = "searchKeyword",required = false)String searchKeyword, + public void exportChangePeo(@Param(value = "searchName", required = false) String searchName, + @Param(value = "searchKeyword", required = false) String searchKeyword, @Param(value = "unitId", required = false) String unitId, @Param(value = "personType", required = false) String personType, @Param(value = "userState", required = false) String userState, @@ -179,11 +176,11 @@ public class UpdateUserController { List userChangeList = historyUserService.listMap(sql); List entities = new ArrayList<>(); - entities.add(new ExcelExportEntity("姓名","username",20)); - entities.add(new ExcelExportEntity("联系电话","mobile",20)); - entities.add(new ExcelExportEntity("单位","unitname",50)); - entities.add(new ExcelExportEntity("身份证","idcard",50)); - entities.add(new ExcelExportEntity("在职状态","userState",20)); + entities.add(new ExcelExportEntity("姓名", "username", 20)); + entities.add(new ExcelExportEntity("联系电话", "mobile", 20)); + entities.add(new ExcelExportEntity("单位", "unitname", 50)); + entities.add(new ExcelExportEntity("身份证", "idcard", 50)); + entities.add(new ExcelExportEntity("在职状态", "userState", 20)); try { ViTool.excelResponse(response, "人员异动名单.xls"); diff --git a/src/main/resources/views/platform/activity/school/ActivityApply.html b/src/main/resources/views/platform/activity/school/ActivityApply.html index 7324fe4..113ff5c 100644 --- a/src/main/resources/views/platform/activity/school/ActivityApply.html +++ b/src/main/resources/views/platform/activity/school/ActivityApply.html @@ -472,10 +472,10 @@ layout("/layouts/platform.html"){ sortable> - + - + { + 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 => {