c-zhouhf1/zhgh_jvic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移植体育活动组队报名

Browse Source
This commit is contained in:
c-zhouhf1
2024-10-30 11:17:36 +08:00
parent 894a8b4c6e
commit b0911d9522
3 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java
+7 -8
View File
@@ -22,12 +22,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.async.Async; import org.nutz.aop.interceptor.async.Async;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.entity.Record;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.dao.util.cri.Static; import org.nutz.dao.util.cri.Static;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.json.Json;
import org.nutz.lang.Strings; import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.At;
@@ -239,7 +239,6 @@ public class ActivityApplyController {
Sql applySql = Sqls.create(""" Sql applySql = Sqls.create("""
SELECT SELECT
asa.* asa.*
FROM FROM
activity_school_apply asa activity_school_apply asa
LEFT JOIN activity_school_team team ON asa.teamId = team.id LEFT JOIN activity_school_team team ON asa.teamId = team.id
@@ -261,8 +260,9 @@ public class ActivityApplyController {
list.forEach(v -> { list.forEach(v -> {
if (Strings.isNotBlank(v.getString("birthday"))) { 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); result.put("list", list);
@@ -361,11 +361,11 @@ public class ActivityApplyController {
@At @At
@ViReturn @ViReturn
@RequiresPermissions("activity.apply") @RequiresPermissions("activity.apply")
public Object doApply(@Param(value = "data",required = false) ActivitySchoolApply[] applies, public Object doApply(@Param(value = "data", required = false) ActivitySchoolApply[] applies,
@Param(value = "appliedData3",required = false) ActivitySchoolApply[] applies2, @Param(value = "appliedData3", required = false) ActivitySchoolApply[] applies2,
@Param(value = "eventId",required = false) String eventId, @Param(value = "eventId", required = false) String eventId,
@Param(value = "activityId") String activityId, @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_user user = (Sys_user) ShiroUtil.getPrincipal();
Sys_unit unit = user.getUnit(); Sys_unit unit = user.getUnit();
ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", unit.getId())); ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", unit.getId()));
@@ -871,5 +871,4 @@ public class ActivityApplyController {
} }
} }
src/main/java/io/v/nutz/data/controller/UpdateUserController.java
+11 -14
View File
@@ -3,7 +3,6 @@ package io.v.nutz.data.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.hutool.core.lang.Assert;
import io.v.nutz.annontation.ViReturn; import io.v.nutz.annontation.ViReturn;
import io.v.nutz.dao.CndPlus; import io.v.nutz.dao.CndPlus;
import io.v.nutz.data.constant.UserChangeType; 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.modules.models.PageForm;
import io.v.nutz.util.ViTool; import io.v.nutz.util.ViTool;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jetbrains.annotations.NotNull;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
@@ -83,7 +80,7 @@ public class UpdateUserController {
cnd.andExcludeEmpty("Date(his.changeTime)", "=", changeDate); cnd.andExcludeEmpty("Date(his.changeTime)", "=", changeDate);
cnd.andExcludeEmpty("his.changeType", "=", changeType); cnd.andExcludeEmpty("his.changeType", "=", changeType);
cnd.asc("u.loginname");
sql.setCondition(cnd); sql.setCondition(cnd);
return historyUserService.list(pageForm, sql); return historyUserService.list(pageForm, sql);
@@ -130,9 +127,9 @@ public class UpdateUserController {
public Object update(String sourceTime, String sourceType, public Object update(String sourceTime, String sourceType,
@Param(value = "columnNames", required = false) String[] columnNames, @Param(value = "columnNames", required = false) String[] columnNames,
@Param(value = "isUpSet", required = false) String isUpSet, @Param(value = "isUpSet", required = false) String isUpSet,
@Param(value = "partGroupId",required = false)String partGroupId, @Param(value = "partGroupId", required = false) String partGroupId,
@Param(value = "isInvert",required = false) boolean isInvert) { @Param(value = "isInvert", required = false) boolean isInvert) {
sourceUserService.updateSysUser(sourceTime, sourceType, columnNames, isUpSet,partGroupId,isInvert); sourceUserService.updateSysUser(sourceTime, sourceType, columnNames, isUpSet, partGroupId, isInvert);
return null; return null;
} }
@@ -147,8 +144,8 @@ public class UpdateUserController {
@At @At
@Ok("void") @Ok("void")
public void exportChangePeo(@Param(value = "searchName",required = false)String searchName, public void exportChangePeo(@Param(value = "searchName", required = false) String searchName,
@Param(value = "searchKeyword",required = false)String searchKeyword, @Param(value = "searchKeyword", required = false) String searchKeyword,
@Param(value = "unitId", required = false) String unitId, @Param(value = "unitId", required = false) String unitId,
@Param(value = "personType", required = false) String personType, @Param(value = "personType", required = false) String personType,
@Param(value = "userState", required = false) String userState, @Param(value = "userState", required = false) String userState,
@@ -179,11 +176,11 @@ public class UpdateUserController {
List<NutMap> userChangeList = historyUserService.listMap(sql); List<NutMap> userChangeList = historyUserService.listMap(sql);
List<ExcelExportEntity> entities = new ArrayList<>(); List<ExcelExportEntity> entities = new ArrayList<>();
entities.add(new ExcelExportEntity("姓名","username",20)); entities.add(new ExcelExportEntity("姓名", "username", 20));
entities.add(new ExcelExportEntity("联系电话","mobile",20)); entities.add(new ExcelExportEntity("联系电话", "mobile", 20));
entities.add(new ExcelExportEntity("单位","unitname",50)); entities.add(new ExcelExportEntity("单位", "unitname", 50));
entities.add(new ExcelExportEntity("身份证","idcard",50)); entities.add(new ExcelExportEntity("身份证", "idcard", 50));
entities.add(new ExcelExportEntity("在职状态","userState",20)); entities.add(new ExcelExportEntity("在职状态", "userState", 20));
try { try {
ViTool.excelResponse(response, "人员异动名单.xls"); ViTool.excelResponse(response, "人员异动名单.xls");
src/main/resources/views/platform/activity/school/ActivityApply.html
+20 -11
View File
@@ -472,10 +472,10 @@ layout("/layouts/platform.html"){
sortable> sortable>
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
align="center" header-align="center" label="电话" align="center" header-align="center" label="电话"
prop="mobile"> prop="mobile">
</el-table-column>--> </el-table-column>-->
<el-table-column <el-table-column
align="center" header-align="center" label="年龄" align="center" header-align="center" label="年龄"
@@ -667,10 +667,10 @@ layout("/layouts/platform.html"){
sortable> sortable>
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
align="center" header-align="center" label="电话" align="center" header-align="center" label="电话"
prop="mobile"> prop="mobile">
</el-table-column>--> </el-table-column>-->
<el-table-column <el-table-column
align="center" header-align="center" label="性别" align="center" header-align="center" label="性别"
@@ -1768,9 +1768,9 @@ layout("/layouts/platform.html"){
this.$set(this.formData, 'unionName', user ? user.unionname : null) this.$set(this.formData, 'unionName', user ? user.unionname : null)
this.$set(this.formData, 'sex', user ? user.sex : null) this.$set(this.formData, 'sex', user ? user.sex : null)
this.$set(this.formData, 'birthday', user ? user.birthday : null) this.$set(this.formData, 'birthday', user ? user.birthday : null)
if (user&&user.birthday){ if (user && user.birthday) {
const year=user.birthday.substring(0,4) const year = user.birthday.substring(0, 4)
this.$set(this.formData, 'age',moment().format("YYYY") - year) this.$set(this.formData, 'age', moment().format("YYYY") - year)
} }
this.$set(this.formData, 'status', 2) this.$set(this.formData, 'status', 2)
}, },
@@ -1819,6 +1819,14 @@ layout("/layouts/platform.html"){
const appliedData = clone(this.appliedData) 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) => { const teamAppliedData = groupBy(appliedData, (v) => {
return v.teamId return v.teamId
}) })
@@ -1946,6 +1954,7 @@ layout("/layouts/platform.html"){
}, },
async delApplyed(index, row, num) { async delApplyed(index, row, num) {
console.log(row)
if (row.identity.length == 1) { if (row.identity.length == 1) {
this.$set(row, "loading", true) this.$set(row, "loading", true)
const user = this.applyUsers.find(v => { const user = this.applyUsers.find(v => {