From 53e6c4bc52ad8cfeb9414aeea3ffb1bb22af5bc3 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 4 Sep 2025 09:40:50 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysRoleController.java | 14 + .../ActivityBasicScopeController.java | 110 +- .../ActivityBasicScopeUserDataController.java | 117 +- .../param/ActivityUserScopePageParam.java | 4 +- .../activity/basic/template/UserTemp.java | 27 + ...ctivityCultureApplyActivityController.java | 14 +- .../ActivityCultureApplyUserController.java | 19 +- .../culture/models/ActivityTissue.java | 33 +- .../service/ActivityCultureService.java | 1 - .../ActivityCultureApplyUserServiceImpl.java | 48 +- .../impl/ActivityCultureServiceImpl.java | 30 - ...EvaluateBranchUnionApprovalController.java | 9 +- ...EvaluateSchoolUnionApprovalController.java | 1 + ...tRecuperationActivitySignUpController.java | 51 +- ...entRecuperationTravelAgencyController.java | 7 +- .../model/ExcellentRecuperationLine.java | 3 +- .../module/activity/ActivityImportUser.vue | 235 +++ .../module/activity/UserDataScope.vue | 632 ++++---- .../components/module/activity/UserScope.vue | 1348 ++++++++--------- .../activity/culture/common/applyActivity.js | 145 +- .../zhgh/activity/culture/common/applyUser.js | 2 +- .../activity/culture/common/infoActivity.js | 6 +- .../activity/culture/common/singleSignUp.js | 78 +- .../activity/culture/common/userStatistics.js | 2 +- .../zhgh/activity/sports/applyUser/index.html | 66 +- .../zhgh/activity/sports/reading/index.html | 7 +- .../dayofficework/evaluation/apply/apply.js | 2 +- .../dayofficework/evaluation/mine/index.html | 2 +- .../evaluation/summary/index.html | 2 +- .../outlay/outlayReimburse/apply/index.html | 3 +- .../activityList/basicForm.js | 3 +- .../activitySignUp/index.html | 12 +- .../activitySignUp/info.js | 83 +- .../activitySignUp/signUpForm.js | 70 +- .../excellentRecuperation/summary/index.html | 4 +- 35 files changed, 1924 insertions(+), 1266 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/activity/basic/template/UserTemp.java create mode 100644 src/main/resources/static/components/module/activity/ActivityImportUser.vue diff --git a/src/main/java/com/budwk/app/sys/controller/SysRoleController.java b/src/main/java/com/budwk/app/sys/controller/SysRoleController.java index f21d53e0..d2915eda 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysRoleController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysRoleController.java @@ -19,8 +19,10 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.nutz.dao.Cnd; +import org.nutz.dao.FieldFilter; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.Daos; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Lang; @@ -29,6 +31,7 @@ import org.nutz.lang.util.NutMap; import org.nutz.log.Log; import org.nutz.log.Logs; import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.GET; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; @@ -490,4 +493,15 @@ public class SysRoleController { return Result.success(); } + @At + @Ok("json:full") + @GET + @SaCheckLogin + public Result getMenuOptions() { + FieldFilter fieldFilter = FieldFilter.create(Sys_menu.class, "^id|name$"); + Cnd cnd = Cnd.where("disabled", "=", 0); + cnd.and(Cnd.exps("parentId", "is", null).or("parentId", "=", "")); + return Result.success(Daos.ext(sysRoleService.dao(), fieldFilter).query(Sys_menu.class, cnd)); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index cb4aadb3..6c6f2d2a 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -5,38 +5,52 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.excel.EasyExcel; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.base.utils.EasyExcelUtil; import com.budwk.app.sys.models.Sys_role; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; import com.budwk.app.zhgh.activity.basic.param.ActivityUserScopePageParam; import com.budwk.app.zhgh.activity.basic.service.ActivityBasicScopeService; +import com.budwk.app.zhgh.activity.basic.template.UserTemp; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.Static; +import org.nutz.integration.jedis.RedisService; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.AdaptBy; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import org.nutz.mvc.upload.TempFile; +import org.nutz.mvc.upload.UploadAdaptor; import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -59,6 +73,9 @@ public class ActivityBasicScopeController { @Inject private Dao dao; + @Inject + private RedisService redisService; + @At("") @Ok("beetl:platform/zhgh/activity/basic/userScope/index.html") @SaCheckPermission("activity.basic.scope") @@ -90,6 +107,7 @@ public class ActivityBasicScopeController { FROM `vw_user` u LEFT JOIN sys_user_role sur on sur.userid = u.id + LEFT JOIN sys_club_user clubuser ON clubuser.userid=u.id $condition """); try { @@ -201,8 +219,8 @@ public class ActivityBasicScopeController { } @At - public Object getRoleListByMenuId(String menuId) { - return Result.success(dao.query(Sys_role.class, Cnd.where("system_name", "=", menuId).desc("code"))); + public Object getRoleListByMenuId() { + return Result.success(dao.query(Sys_role.class, Cnd.NEW().desc("code"))); } @@ -275,6 +293,7 @@ public class ActivityBasicScopeController { FROM `vw_user` u LEFT JOIN sys_user_role sur on sur.userid = u.id + LEFT JOIN sys_club_user clubuser ON clubuser.userid=u.id $condition """); @@ -342,6 +361,11 @@ public class ActivityBasicScopeController { } + if (StrUtil.isNotBlank(activityUserScopePageParam.getExistsLoginNameRedisKey())) { + List loginNames = redisService.lrange(activityUserScopePageParam.getExistsLoginNameRedisKey(), 0, -1); + cnd.andEX("u.loginname", "in", loginNames); + } + try { @@ -350,8 +374,8 @@ public class ActivityBasicScopeController { cnd.andEX("u.personType", IN_OR_NIN_OP, activityUserScopePageParam.getPersonTypes()); cnd.andEX("u.userState", IN_OR_NIN_OP, activityUserScopePageParam.getUserStates()); cnd.andEX("u.sex", IN_OR_NIN_OP, activityUserScopePageParam.getSexTypes()); - cnd.andEX("sur.jdhid", EQ_OR_NEQ_OP, activityUserScopePageParam.getTeacherMeetingId()); - cnd.andEX("sur.roleid", IN_OR_NIN_OP, activityUserScopePageParam.getRoleIds()); + cnd.andEX("sur.tcSessionId", EQ_OR_NEQ_OP, activityUserScopePageParam.getSessionId()); + cnd.andEX("sur.roleId", IN_OR_NIN_OP, activityUserScopePageParam.getRoleIds()); cnd.andEX("clubuser.clubid", EQ_OR_NEQ_OP, activityUserScopePageParam.getClubId()); } catch (Exception e) { @@ -362,4 +386,82 @@ public class ActivityBasicScopeController { } + @At + @Ok("void") + @ApiOperation("下载导入人员模板") + @SaCheckPermission("activity.basic.user") + public void downloadImport(HttpServletResponse response) { + try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();) { + EasyExcel.write(byteArrayOutputStream, UserTemp.class) + .sheet("福利名单导入模版") + .doWrite(ArrayList::new); + CommonDownloadUtil.download("人员导入模板.xlsx", byteArrayOutputStream.toByteArray(), response); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + + @At + @SaCheckPermission("activity.basic.user") + @ApiOperation("导入人员核对名单") + @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) + public Result doImport(TempFile file) { + String matchUserLoginNamesKey = "ActivityBasicScopeController.doImport.time=" + System.currentTimeMillis(); + List ts = EasyExcelUtil.syncReadModel(file.getFile(), UserTemp.class, 0, 1); + List userImportList = JSONUtil.parseArray(JSONUtil.toJsonStr(ts)).toList(UserTemp.class); + + //判断人员哪些存在哪些不存在 + Sql sql = Sqls.queryString(""" + SELECT + u.loginname + FROM + sys_user u + """); + dao.execute(sql); + String[] sysLoginNames = (String[]) sql.getResult(); + + //存在的工号 + List existsLoginNames = new ArrayList<>(); + + for (UserTemp excelUser : userImportList) { + if (ArrayUtil.contains(sysLoginNames, excelUser.getLoginName())) { + existsLoginNames.add(excelUser.getLoginName()); + } else { + excelUser.setErrorInfo("系统查不到此人"); + } + } + + //匹配不到的用户 + List errorExcelTempUsers = userImportList.stream().filter(v -> StrUtil.isNotBlank(v.getErrorInfo())).collect(Collectors.toList()); + NutMap nutMap = NutMap.NEW(); + nutMap.setv("totalCount", userImportList.size()); + nutMap.setv("successCount", existsLoginNames.size()); + nutMap.setv("errorCount", errorExcelTempUsers.size()); + nutMap.setv("errorList", errorExcelTempUsers.stream().map(v -> { + return NutMap.NEW().addv("工号", v.getLoginName()).addv("姓名", v.getUserName()).addv("错误原因", v.getErrorInfo()); + }).collect(Collectors.toList())); + nutMap.setv("existsLoginNameRedisKey", matchUserLoginNamesKey); + + //保存存在的工号 + if (Lang.isNotEmpty(existsLoginNames)) { + redisService.lpush(matchUserLoginNamesKey, existsLoginNames.toArray(new String[0])); + redisService.expire(matchUserLoginNamesKey, 60 * 3); + } + return Result.success(nutMap); + } + + @At + @SaCheckPermission("activity.basic.user") + @ApiOperation("清空查询条件") + public Result clearSearchCnd(String existsLoginNameRedisKey) { + if (StrUtil.isNotBlank(existsLoginNameRedisKey)) { + redisService.del(existsLoginNameRedisKey); + } + return Result.success(); + } + + + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeUserDataController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeUserDataController.java index 323e7f8c..0c1e3ccb 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeUserDataController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeUserDataController.java @@ -2,26 +2,43 @@ package com.budwk.app.zhgh.activity.basic.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.EasyExcelUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; +import com.budwk.app.zhgh.activity.basic.template.UserTemp; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.formula.functions.T; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.Static; +import org.nutz.integration.jedis.RedisService; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.AdaptBy; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import org.nutz.mvc.upload.TempFile; +import org.nutz.mvc.upload.UploadAdaptor; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * @ClassName ActivityBasicScopeUserDataController @@ -37,6 +54,9 @@ public class ActivityBasicScopeUserDataController { @Inject private BaseService baseService; + @Inject + private RedisService redisService; + @At("") @Ok("beetl:platform/zhgh/activity/basic/userScopeData/index.html") @SaCheckPermission("activity.basic.user") @@ -51,29 +71,8 @@ public class ActivityBasicScopeUserDataController { @Param(value = "unitId") String unitId, @Param(value = "personType") String personType, @Param(value = "userState") String userState, - @Param(value = "groupId") Integer groupId) { - /* Sql sql = Sqls.create(""" - SELECT - aus.id, - u.username AS userName, - u.loginname AS loginName, - u.sex, - u.birthday, - u.mobile, - u.personType, - u.userState, - u.unitname AS unitName, - u.unionname AS unionName, - aus.groupId, - aus.groupName, - actun.unionname AS activityUnionName - FROM - activity_user_scope aus - LEFT JOIN `vw_user` u ON u.id = aus.userId - LEFT JOIN activity_basic_unit actit ON actit.id=u.unitid - LEFT JOIN activity_basic_union actun ON actit.unionid=actun.id - $condition - """);*/ + @Param(value = "groupId") Integer groupId, + @Param(value = "existsLoginNameRedisKey") String existsLoginNameRedisKey) { Sql sql = Sqls.create(""" SELECT aus.id, @@ -107,9 +106,13 @@ public class ActivityBasicScopeUserDataController { cnd.andEX("u.personType", "=", personType); cnd.andEX("u.userState", "=", userState); if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) && - !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { + !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("aus.creator", "=", SecurityUtil.getUserId()); } + if (StrUtil.isNotBlank(existsLoginNameRedisKey)) { + List loginNames = redisService.lrange(existsLoginNameRedisKey, 0, -1); + cnd.andEX("u.loginname", "in", loginNames); + } sql.setCondition(cnd); Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @@ -134,7 +137,17 @@ public class ActivityBasicScopeUserDataController { @Param(value = "unionId") String unionId, @Param(value = "unitId") String unitId, @Param(value = "personType") String personType, - @Param(value = "userState") String userState) { + @Param(value = "userState") String userState, + @Param(value = "existsLoginNameRedisKey") String existsLoginNameRedisKey) { + + List existsLoginNames = new ArrayList<>(); + if(StrUtil.isNotBlank(existsLoginNameRedisKey) && redisService.exists(existsLoginNameRedisKey)){ + existsLoginNames = redisService.lrange(existsLoginNameRedisKey, 0, -1); + if (StrUtil.isNotBlank(existsLoginNameRedisKey)) { + redisService.del(existsLoginNameRedisKey); + } + } + Sql sql = Sqls.create("select id from `vw_user` u $condition"); Cnd userCnd = Cnd.NEW(); if (StrUtil.isNotBlank(searchName) && StrUtil.isNotBlank(searchKeyword)) { @@ -145,12 +158,13 @@ public class ActivityBasicScopeUserDataController { userCnd.andEX("u.personType", "=", personType); userCnd.andEX("u.userState", "=", userState); userCnd.andEX("u.id", "=", id); + userCnd.andEX("u.loginname","in",existsLoginNames); sql.setCondition(userCnd); Cnd cnd = Cnd.NEW(); cnd.and("groupId", "=", groupId); if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) && - !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { + !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("creator", "=", SecurityUtil.getUserId()); } if (StrUtil.isNotBlank(id)) { @@ -163,5 +177,56 @@ public class ActivityBasicScopeUserDataController { return Result.success(); } + @At + @SaCheckPermission("activity.basic.user") + @ApiOperation("导入人员核对名单") + @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) + public Result doImport(@Valid String groupId, TempFile file) { + String matchUserLoginNamesKey = "ActivityBasicUserController.doImport.groupId=" + groupId + "time=" + System.currentTimeMillis(); + List ts = EasyExcelUtil.syncReadModel(file.getFile(), UserTemp.class, 0, 1); + List userImportList = JSONUtil.parseArray(JSONUtil.toJsonStr(ts)).toList(UserTemp.class); + + //判断人员哪些存在哪些不存在 + Sql sql = Sqls.queryString(""" + SELECT + u.loginname + FROM + activity_user_scope aus + LEFT JOIN sys_user u ON u.id = aus.userId + WHERE + aus.groupId = @groupId + """).setParam("groupId", groupId); + baseService.execute(sql); + String[] sysLoginNames = (String[]) sql.getResult(); + + //存在的工号 + List existsLoginNames = new ArrayList<>(); + + for (UserTemp excelUser : userImportList) { + if (ArrayUtil.contains(sysLoginNames, excelUser.getLoginName())) { + existsLoginNames.add(excelUser.getLoginName()); + } else { + excelUser.setErrorInfo("系统查不到此人"); + } + } + + //匹配不到的用户 + List errorExcelTempUsers = userImportList.stream().filter(v -> StrUtil.isNotBlank(v.getErrorInfo())).collect(Collectors.toList()); + NutMap nutMap = NutMap.NEW(); + nutMap.setv("totalCount", userImportList.size()); + nutMap.setv("successCount", existsLoginNames.size()); + nutMap.setv("errorCount", errorExcelTempUsers.size()); + nutMap.setv("errorList", errorExcelTempUsers.stream().map(v -> { + return NutMap.NEW().addv("工号", v.getLoginName()).addv("姓名", v.getUserName()).addv("错误原因", v.getErrorInfo()); + }).collect(Collectors.toList())); + nutMap.setv("existsLoginNameRedisKey", matchUserLoginNamesKey); + + //保存存在的工号 + if (Lang.isNotEmpty(existsLoginNames)) { + redisService.lpush(matchUserLoginNamesKey, existsLoginNames.toArray(new String[0])); + redisService.expire(matchUserLoginNamesKey, 60 * 3); + } + return Result.success(nutMap); + } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/param/ActivityUserScopePageParam.java b/src/main/java/com/budwk/app/zhgh/activity/basic/param/ActivityUserScopePageParam.java index e11cac5e..f519c25c 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/param/ActivityUserScopePageParam.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/param/ActivityUserScopePageParam.java @@ -33,7 +33,7 @@ public class ActivityUserScopePageParam extends PageForm { private Integer setGroupId; private String setGroupName; // 教师会议id - private String teacherMeetingId; + private String sessionId; // 角色id private String[] roleIds; // 用户id @@ -46,4 +46,6 @@ public class ActivityUserScopePageParam extends PageForm { private String props; + private String existsLoginNameRedisKey; + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/template/UserTemp.java b/src/main/java/com/budwk/app/zhgh/activity/basic/template/UserTemp.java new file mode 100644 index 00000000..72906e53 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/template/UserTemp.java @@ -0,0 +1,27 @@ +package com.budwk.app.zhgh.activity.basic.template; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode +@ContentRowHeight(20) // 内容行高 +@HeadRowHeight(20) // 表头行高 +@ColumnWidth(25) +public class UserTemp { + + @ExcelProperty("工号") + private String loginName; + + @ExcelProperty("姓名") + private String userName; + + @ExcelIgnore + private String errorInfo; + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index a200a3b5..f483a3df 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.activity.culture.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.date.DateUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.result.Result; @@ -12,6 +13,7 @@ import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService; import com.budwk.app.zhgh.club.model.SysClub; import com.budwk.app.zhgh.club.service.SysClubService; +import io.swagger.annotations.ApiOperation; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; @@ -79,10 +81,16 @@ public class ActivityCultureApplyActivityController { @At - @SLog(tag = "文化活动", msg = "添加了一条文化活动记录", param = true, result = true) + @ApiOperation("保存活动申报") + @SLog( tag = "文化活动-活动申报", msg = "保存了一条文化活动记录") @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) - public Result doAdd(@Param("tissue") @Valid ActivityTissue tissue) { - activityCultureService.doAddActivity(tissue); + public Result save(@Param("data") ActivityTissue tissue) { + if (tissue.getActivity_type() == 40002) { + tissue.setUnionId(SecurityUtil.getUnionId()); + } + tissue.setUserId(SecurityUtil.getUserId()); + tissue.setApplyTime(DateUtil.now()); + activityCultureService.insertOrUpdate(tissue); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java index ba7dc864..edff076b 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java @@ -3,7 +3,6 @@ package com.budwk.app.zhgh.activity.culture.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.stream.CollectorUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; @@ -15,12 +14,10 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.culture.models.ActivityTissuePerson; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureApplyUserService; import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; @@ -34,7 +31,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; /** * @ClassName ActivityCultureApplyUserController @@ -115,11 +111,14 @@ public class ActivityCultureApplyUserController { @At @SaCheckLogin @ApiOperation(value = "队友搜索") - public Result queryTeammate(@Valid String keyword) { + public Result queryTeammate(@Valid String keyword,Integer signUpMethod) { Sql sql = Sqls.create("select id userId,username userName,loginname loginName,sex,mobile,unitName from vw_user $condition limit 0,10"); Cnd cnd = Cnd.NEW(); cnd.or(Cnd.likeEX("username", keyword)); cnd.or(Cnd.likeEX("loginname", keyword)); + if (signUpMethod == 3){ + cnd.and("unionid", "=", SecurityUtil.getUnionId()); + } sql.setCondition(cnd); List list = activityCultureApplyUserService.listMap(sql); return Result.success(list); @@ -142,6 +141,16 @@ public class ActivityCultureApplyUserController { return Result.success(list); } + @At + @SaCheckLogin + @ApiOperation(value = "查询分工会报名人员") + public Result listTeamUserUnion(@Valid String activityId) { + List list = dao.query(ActivityTissuePerson.class, Cnd.where(ActivityTissuePerson::getTissueId, "=", activityId) + .and(ActivityTissuePerson::getApplyUserId, "=", SecurityUtil.getUserId()) + ); + return Result.success(list); + } + @At @SaCheckLogin @ApiOperation(value = "是否报名") diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index a72512ff..a43781d2 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -1,12 +1,8 @@ package com.budwk.app.zhgh.activity.culture.models; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; import com.budwk.app.base.model.CustomFormField; -import com.budwk.app.sys.models.Sys_home_activity; -import com.budwk.app.sys.services.SysHomeConvert; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; @@ -25,7 +21,7 @@ import java.util.List; @Data @Comment("文化活动表") @Table("activity_tissue") -public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert { +public class ActivityTissue extends BaseModel implements Serializable { @Column @Name @@ -252,32 +248,5 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo @Many(field = "tissueId") private List tissuePersonList; - @Override - public Sys_home_activity covertToSysHomeActivity() { - Sys_home_activity sysHomeActivity = new Sys_home_activity(); - sysHomeActivity.setId(this.getId()); - sysHomeActivity.setName(this.getName()); - sysHomeActivity.setCover(this.getCover()); - if (this.getActivity_type() == 40001) { - sysHomeActivity.setUrl("/platform/activity/culture/applyUser/school"); - } else if (this.getActivity_type() == 40002) { - sysHomeActivity.setUrl("/platform/activity/culture/applyUser/union"); - } else if (this.getActivity_type() == 40003) { - sysHomeActivity.setUrl("/platform/activity/culture/applyUser/club"); - } - sysHomeActivity.setH5Url("/platform/h5/activity/culture/applyUser"); - if (StrUtil.isNotBlank(this.getApplyStartTime())) { - sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime())); - sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime())); - } - sysHomeActivity.setAllowUserGroupId(this.getGroupId()); - sysHomeActivity.setEnable(this.getIsUnseal()); - sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); - return sysHomeActivity; - } - - - private String username; - private String loginname; } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/ActivityCultureService.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/ActivityCultureService.java index f8f89d2a..8c38bed6 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/ActivityCultureService.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/ActivityCultureService.java @@ -18,7 +18,6 @@ public interface ActivityCultureService extends BaseService { */ List getUnionData(String activityScopeGroupId); - void doAddActivity(ActivityTissue tissue); void doEditActivity(ActivityTissue tissue); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java index 92b34c2d..8e1f1072 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java @@ -4,14 +4,11 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.exception.BaseException; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; -import com.budwk.app.base.result.Result; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.sys.views.View_user; -import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; @@ -21,15 +18,11 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; 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.IocBean; -import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -221,23 +214,30 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl fullPersonList = listEntity(sql); + insert(fullPersonList); } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java index 359c4bed..1ade50f3 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java @@ -1,12 +1,10 @@ package com.budwk.app.zhgh.activity.culture.service.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.model.Audit; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.sys.models.Sys_home_activity; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; @@ -72,38 +70,10 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl } } - @Override - public void doAddActivity(ActivityTissue tissue) { - tissue.setUserId(SecurityUtil.getUserId()); - tissue.setApplyTime(DateUtil.now()); - tissue.setIsUnseal(true); - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - tissue.setState(1); - } else { - tissue.setState(3); - } - if (tissue.getActivity_type() == 40002) { - tissue.setUnionId(SecurityUtil.getUnionId()); - } else if (tissue.getActivity_type() == 40003) { - -// tissue.setClubId(vi.getClubId()); - } - insertWith(tissue, "tissuePersonList"); - if (tissue.getIsEnrollSystem()) { - Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); - dao().insertOrUpdate(sysHomeActivity); - } - } @Override public void doEditActivity(ActivityTissue tissue) { update(tissue); - if (tissue.getIsEnrollSystem()) { - Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); - dao().insertOrUpdate(sysHomeActivity); - } else { - dao().delete(Sys_home_activity.class, tissue.getId()); - } } @Override diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateBranchUnionApprovalController.java index fb6ec966..ddc7653c 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateBranchUnionApprovalController.java @@ -57,7 +57,7 @@ public class EvaluateBranchUnionApprovalController { ea.name AS evaluateName, hb.name AS honorName, bs.name as honorTypeName, - ins.id AS instanceId, + ins.id AS instanceId, ins.businessNo, ins.state instanceState, ins.variable instanceVariable, @@ -76,17 +76,18 @@ public class EvaluateBranchUnionApprovalController { FROM wf_process_task t LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 LEFT JOIN evaluate_apply info ON info.id = ins.businessNo LEFT JOIN evaluate_activity ea ON ea.id = info.evaluateId LEFT JOIN honor_basic_settings hb ON hb.id = info.honorId LEFT JOIN honor_basic_settings bs ON bs.id = info.honorTypeId - LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id - LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 - LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 $condition """); Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "=", "3bdaa29d-e5eb-4e3e-b7f1-14d03bedd078"); + cnd.and("info.evaluateId", "=", pageForm.getEvaluateId()); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateSchoolUnionApprovalController.java index 8bc5bcda..bf7fc275 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateSchoolUnionApprovalController.java @@ -102,6 +102,7 @@ public class EvaluateSchoolUnionApprovalController { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("info.unionId","=",pageForm.getUnionId()); cnd.andEX("info.unitId","=",pageForm.getUnitId()); + cnd.andEX("info.evaluateId","=",pageForm.getEvaluateId()); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationActivitySignUpController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationActivitySignUpController.java index 1b9e9d25..707987ba 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationActivitySignUpController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationActivitySignUpController.java @@ -15,13 +15,13 @@ import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.flow.entity.ProcessInstance; import com.budwk.app.flow.entity.ProcessTask; -import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model.ExcellentRecuperationActivity; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model.ExcellentRecuperationLine; +import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model.ExcellentRecuperationQuotaAllocation; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model.ExcellentRecuperationSignUpUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -149,7 +149,7 @@ public class ExcellentRecuperationActivitySignUpController { @At @ApiOperation("删除报名信息") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("enrollmentRegistration.summary") + @SaCheckPermission("excellentRecuperation.activitySignUp") @SLog(tag = "优秀教职工疗休养-活动报名", type = "excellentRecuperationActivitySignUp", msg = "删除id: ${args[0]}") public Result doDelete(String id) { dao.delete(ExcellentRecuperationSignUpUser.class, id); @@ -205,6 +205,9 @@ public class ExcellentRecuperationActivitySignUpController { public Result listActivityByYear(String year) { List activityList = dao.query(ExcellentRecuperationActivity.class, Cnd.where("YEAR(signUpStartTime)", "=", year).desc("signUpStartTime")); + activityList.forEach(activity -> { + activity.setUnionQuotaAllocationList(dao.query(ExcellentRecuperationQuotaAllocation.class, Cnd.where("activityId", "=", activity.getId()))); + }); return Result.success(activityList); } @@ -258,5 +261,47 @@ public class ExcellentRecuperationActivitySignUpController { return Result.success(dao.fetch(ExcellentRecuperationSignUpUser.class, id)); } + @At + @ApiOperation("查询报名人员") + @SaCheckLogin + public Result getSIgnUpUserList(String unionId, String activityId){ + Sql sql = Sqls.create(""" + SELECT + info.*, + line.lineName, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + ins.processDefineId instanceProcessDefineId, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariale, + IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, + (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask' AND taskState IN (10, 20)) AS startTaskId + FROM + excellent_recuperation_sign_user info + LEFT JOIN excellent_recuperation_line line ON line.id = info.lineId + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id + AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("info.activityId", "=", activityId); + cnd.and("info.unionId", "=", unionId); + cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode()); + sql.setCondition(cnd); + List map = baseService.listMap(sql); + return Result.success(map); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationTravelAgencyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationTravelAgencyController.java index 24e0f443..466a2bd8 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationTravelAgencyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationTravelAgencyController.java @@ -19,7 +19,6 @@ import com.budwk.app.base.utils.PageUtil; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model.ExcellentRecuperationTravelAgency; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.service.ExcellentRecuperationTravelAgencyService; import com.budwk.app.zhgh.staffbenefit.recuperation.mode.TravelAgencyExcelMode; -import com.budwk.app.zhgh.staffbenefit.recuperation.model.RecuperationTravelAgency; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -221,8 +220,8 @@ public class ExcellentRecuperationTravelAgencyController { ExcelImportRes excelImportRes = new ExcelImportRes<>(); excelImportRes.setTotalRecords(travelAgency.size()); - List travelAgencyList = dao.query(RecuperationTravelAgency.class, Cnd.NEW().desc("id")); - Map map = travelAgencyList.stream().collect(Collectors.toMap(RecuperationTravelAgency::getTravelAgencyName, RecuperationTravelAgency::getId)); + List travelAgencyList = dao.query(ExcellentRecuperationTravelAgency.class, Cnd.NEW().desc("id")); + Map map = travelAgencyList.stream().collect(Collectors.toMap(ExcellentRecuperationTravelAgency::getTravelAgencyName, ExcellentRecuperationTravelAgency::getId)); for (int i = 0; i < travelAgency.size(); i++) { TravelAgencyExcelMode travel = travelAgency.get(i); @@ -234,7 +233,7 @@ public class ExcellentRecuperationTravelAgencyController { travel.setErrInfo("旅行社名称为空", i + 1); continue; } - RecuperationTravelAgency agency = new RecuperationTravelAgency(); + ExcellentRecuperationTravelAgency agency = new ExcellentRecuperationTravelAgency(); if (Strings.isNotBlank(map.get(travel.getTravelAgencyName()))){ agency.setId(map.get(travel.getTravelAgencyName())); } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/model/ExcellentRecuperationLine.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/model/ExcellentRecuperationLine.java index aa8e05bf..616426e6 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/model/ExcellentRecuperationLine.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/model/ExcellentRecuperationLine.java @@ -1,7 +1,6 @@ package com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model; import com.budwk.app.base.model.BaseModel; -import com.budwk.app.zhgh.staffbenefit.recuperation.model.RecuperationTravelAgency; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; @@ -55,7 +54,7 @@ public class ExcellentRecuperationLine extends BaseModel { private boolean isDisabled; @Column - @ColDefine(type = ColType.VARCHAR, width = 50) + @ColDefine(type = ColType.VARCHAR, width = 500) @Comment("缩略图") private String file; diff --git a/src/main/resources/static/components/module/activity/ActivityImportUser.vue b/src/main/resources/static/components/module/activity/ActivityImportUser.vue new file mode 100644 index 00000000..0d577998 --- /dev/null +++ b/src/main/resources/static/components/module/activity/ActivityImportUser.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/main/resources/static/components/module/activity/UserDataScope.vue b/src/main/resources/static/components/module/activity/UserDataScope.vue index 962a6212..afb1938e 100644 --- a/src/main/resources/static/components/module/activity/UserDataScope.vue +++ b/src/main/resources/static/components/module/activity/UserDataScope.vue @@ -1,319 +1,347 @@ diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index 8627ddbc..cb88804f 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -1,773 +1,751 @@