From b6cb965bf44456cb885e56dde7316652a16a52b4 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 16 Nov 2026 08:46:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WelfareSelectionSituationController.java | 3 +- .../WelfareStatisticsController.java | 35 +- .../WelfareUserChooseController.java | 6 +- .../WelfareUserSelectController.java | 3 +- .../welfare/model/WelfareUserSelection.java | 2 +- .../service/WelfareProjectService.java | 8 + .../service/WelfareStatisticsService.java | 20 + .../impl/WelfareProjectServiceImpl.java | 19 + .../impl/WelfareStatisticsServiceImpl.java | 228 ++++++++ .../zhgh/welfare/projectMange/filterUser.js | 4 + .../welfare/selectionSituation/index.html | 26 +- .../welfare/statistics/batchSelectDialog.js | 505 ++++++++++++++++++ .../zhgh/welfare/statistics/index.html | 40 +- .../zhgh/welfare/welfareUser/addUser.js | 4 + .../zhgh/welfare/welfareUser/index.html | 31 +- .../platform/zhghh5/welfare/select/index.html | 7 +- 16 files changed, 908 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/views/platform/zhgh/welfare/statistics/batchSelectDialog.js diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java index ee09672..8ba36cb 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java @@ -90,7 +90,8 @@ public class WelfareSelectionSituationController { return Result.error("此用户没有选择的权限"); } - WelfareProject project = dao.fetch(WelfareProject.class, projectId); + // 人工修改选择与批量代选按项目串行,保留本接口原有的修改语义。 + WelfareProject project = welfareProjectService.lockProjectForSelection(projectId); if (project == null) { return Result.error("福利项目不存在"); } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java index 56218a0..d06a80b 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java @@ -22,6 +22,7 @@ import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; +import org.nutz.lang.Strings; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; @@ -205,14 +206,42 @@ public class WelfareStatisticsController { welfareStatisticsService.exportSummary(projectId,response); } + /** + * @param projectId 福利项目 ID + * @param unionId 页面工会筛选 ID,空值表示账号权限内的工会 + * @return JSON Result,data.project 包含项目规则和套餐,data.unSelectedCount 为未选人数 + */ + @At + @SaCheckPermission("welfare.statistics") + @ApiOperation("获取批量代选配置") + public Result batchSelectInfo(String projectId, String unionId) { + if (Strings.isBlank(projectId) || projectId.length() > 32 + || (unionId != null && unionId.length() > 32)) { + return Result.error("请选择有效的福利项目和工会"); + } + return welfareStatisticsService.batchSelectInfo(projectId, unionId); + } + + /** + * @param projectId 福利项目 ID + * @param unionId 页面工会筛选 ID,实际操作范围由 service 按登录账号限制 + * @param welfareOptions JSON 数组,每项包含 id(套餐 ID)、selectNum(每人正整数份数) + * @return JSON Result,data.assignedCount 为实际分配人数,data.skippedCount 为范围内已选人数 + */ @At @SaCheckPermission("welfare.statistics") @Aop(TransAop.READ_COMMITTED) @SLog(tag = "福利统计", msg = "管理员代选福利") @ApiOperation("管理员代选福利") - public Result doSelectByAdmin(@Valid String projectId, @Param("welfareOptions") @Valid String welfareOptions) { - welfareSingleService.doSelectByAdmin(projectId, welfareOptions); - return Result.success(); + public Result doSelectByAdmin(String projectId, String unionId, @Param("welfareOptions") String welfareOptions) { + if (Strings.isBlank(projectId) || projectId.length() > 32 + || (unionId != null && unionId.length() > 32)) { + return Result.error("请选择有效的福利项目和工会"); + } + if (Strings.isBlank(welfareOptions) || welfareOptions.length() > 65536) { + return Result.error("请选择有效的福利套餐"); + } + return welfareStatisticsService.batchSelect(projectId, unionId, welfareOptions); } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserChooseController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserChooseController.java index 822056e..b29a340 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserChooseController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserChooseController.java @@ -10,6 +10,7 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareList; import com.budwk.app.zhgh.welfare.model.WelfareProject; import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; +import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; @@ -42,6 +43,8 @@ public class WelfareUserChooseController { private Dao dao; @Inject private BaseService baseService; + @Inject + private WelfareProjectService welfareProjectService; @At("") @Ok("beetl:/platform/zhgh/welfare/userChoose/index.html") @@ -89,7 +92,8 @@ public class WelfareUserChooseController { @SLog(type = "welfare", tag = "选择福利", msg = "福利") @SaCheckPermission("welfare.user.choose") public Result confirmSelect(@Param("welfareUserSelections") WelfareUserSelection[] welfareUserSelections, String projectId) { - WelfareProject project = baseService.dao().fetch(WelfareProject.class, projectId); + // 兼容旧选择入口,与新的批量代选入口共用项目事务锁。 + WelfareProject project = welfareProjectService.lockProjectForSelection(projectId); if (project == null) { return Result.error("福利项目不存在"); } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java index b95c28a..595359f 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java @@ -92,7 +92,8 @@ public class WelfareUserSelectController { if (count == 0) { return Result.error("您没有选择的权限"); } - WelfareProject project = dao.fetch(WelfareProject.class, projectId); + // 与统计页批量代选共用项目锁,避免检查未选状态后发生交叉写入。 + WelfareProject project = welfareProjectService.lockProjectForSelection(projectId); if (project == null) { return Result.error("福利项目不存在"); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareUserSelection.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareUserSelection.java index 0ae808c..23d5195 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareUserSelection.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareUserSelection.java @@ -52,7 +52,7 @@ public class WelfareUserSelection extends BaseModel implements Serializable { @Column @Comment("选择用户") - @ColDefine(type = ColType.VARCHAR, width = 32) + @ColDefine(type = ColType.VARCHAR, width = 100) private String userName; @Column diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java index 389a53a..9e10329 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java @@ -17,6 +17,14 @@ public interface WelfareProjectService extends BaseService { */ WelfareProject projectInfo(String projectId); + /** + * 在调用方的 READ_COMMITTED 事务中锁定项目,使批量代选和个人提交按顺序执行。 + * + * @param projectId 福利项目 ID,不接收用户 ID 或套餐 ID + * @return 锁定后的项目实体;项目不存在或 ID 为空时返回 null,锁随调用方事务结束释放 + */ + WelfareProject lockProjectForSelection(String projectId); + /** * 查询可用于沿用配置的历史福利项目。 * diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareStatisticsService.java b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareStatisticsService.java index 1217d76..4de56af 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareStatisticsService.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareStatisticsService.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.welfare.service; 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.zhgh.welfare.model.WelfareProject; import org.nutz.lang.util.NutMap; @@ -10,6 +11,25 @@ import javax.servlet.http.HttpServletResponse; public interface WelfareStatisticsService extends BaseService { + /** + * 获取批量代选弹框的项目规则、套餐及实时未选人数。 + * + * @param projectId 当前福利项目 ID + * @param unionId 页面筛选的工会 ID;为空表示当前账号权限内的工会 + * @return Result,data.project 为项目及 options,data.unSelectedCount 为去重后的未选人数 + */ + Result batchSelectInfo(String projectId, String unionId); + + /** + * 按当前项目规则向权限范围内的未选人员分配同一套餐组合。 + * + * @param projectId 当前福利项目 ID + * @param unionId 页面筛选的工会 ID;分工会角色始终限制在本工会 + * @param welfareOptions JSON 数组,每项仅使用 id(套餐 ID)和 selectNum(正整数份数) + * @return Result,data.assignedCount 为本次分配人数,data.skippedCount 为范围内已选人数 + */ + Result batchSelect(String projectId, String unionId, String welfareOptions); + /** * 分页查询 * @param projectId diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java index da2c6b7..9f31443 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.welfare.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.sys.models.Sys_home_activity; import com.budwk.app.sys.models.Sys_user; @@ -49,6 +50,24 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl i return project; } + @Override + public WelfareProject lockProjectForSelection(String projectId) { + if (StrUtil.isBlank(projectId)) { + return null; + } + + // 所有选择入口先锁同一项目,再读写选择记录;锁必须覆盖完整的外层提交事务。 + Sql sql = Sqls.create( + "SELECT id FROM welfare_project " + + "WHERE id = @projectId FOR UPDATE" + ); + sql.setParam("projectId", projectId); + if (listMap(sql).isEmpty()) { + return null; + } + return fetch(projectId); + } + @Override public List listHistoryProject() { return dao().query(WelfareProject.class, Cnd.NEW().desc(WelfareProject::getYear).desc(WelfareProject::getChoiceTimeStart)); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java index 476f5a8..dc8a480 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java @@ -10,6 +10,7 @@ import cn.hutool.core.util.StrUtil; 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.impl.BaseServiceImpl; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.sys.models.Sys_union; @@ -17,10 +18,13 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareProject; import com.budwk.app.zhgh.welfare.model.WelfareProjectSubjectOption; +import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; +import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import com.budwk.app.zhgh.welfare.service.WelfareStatisticsService; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.FieldFilter; @@ -29,21 +33,245 @@ import org.nutz.dao.sql.Sql; import org.nutz.dao.util.Daos; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.aop.Aop; +import org.nutz.json.Json; import org.nutz.lang.util.NutMap; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; @IocBean(args = {"refer:dao"}) @Slf4j public class WelfareStatisticsServiceImpl extends BaseServiceImpl implements WelfareStatisticsService { + @Inject + private WelfareProjectService welfareProjectService; + public WelfareStatisticsServiceImpl(Dao dao) { super(dao); } + @Override + public Result batchSelectInfo(String projectId, String unionId) { + String scopeError = validateBatchScope(unionId); + if (scopeError != null) { + return Result.error(scopeError); + } + + WelfareProject project = welfareProjectService.projectInfo(projectId); + String projectError = validateBatchProject(project); + if (projectError != null) { + return Result.error(projectError); + } + long unSelectedCount = batchSelectionUsers(projectId, unionId).stream() + .filter(user -> user.getInt("hasSelected") == 0) + .count(); + return Result.success(NutMap.NEW() + .addv("project", project) + .addv("unSelectedCount", unSelectedCount)); + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public Result batchSelect(String projectId, String unionId, String welfareOptions) { + String scopeError = validateBatchScope(unionId); + if (scopeError != null) { + return Result.error(scopeError); + } + + // 先锁项目再读取最新规则和人员状态,重复批量请求会依次执行并跳过已选人员。 + WelfareProject project = welfareProjectService.lockProjectForSelection(projectId); + if (project != null) { + dao().fetchLinks(project, "options", Cnd.NEW().asc("optionSort")); + } + String projectError = validateBatchProject(project); + if (projectError != null) { + return Result.error(projectError); + } + + List requestedOptions; + try { + requestedOptions = Json.fromJsonAsList(NutMap.class, welfareOptions); + } catch (RuntimeException e) { + return Result.error("套餐参数格式不正确,请重新打开弹框选择"); + } + String selectionError = validateBatchOptions(project, requestedOptions); + if (selectionError != null) { + return Result.error(selectionError); + } + + List users = batchSelectionUsers(projectId, unionId); + Map optionsById = project.getOptions().stream() + .collect(Collectors.toMap(WelfareProjectSubjectOption::getId, option -> option)); + Date selectTime = new Date(); + List pending = new ArrayList<>(); + int assignedCount = 0; + int skippedCount = 0; + for (NutMap user : users) { + if (user.getInt("hasSelected") != 0) { + skippedCount++; + continue; + } + + for (NutMap requested : requestedOptions) { + WelfareProjectSubjectOption option = optionsById.get(requested.getString("id")); + WelfareUserSelection selection = new WelfareUserSelection(); + selection.setWelfareId(projectId); + selection.setSubjectId(option.getSubjectId()); + selection.setSelectOptionId(option.getId()); + selection.setSelectUserId(user.getString("userId")); + selection.setUserName(user.getString("userName")); + selection.setSelectNum(requested.getInt("selectNum")); + selection.setSelectTime(selectTime); + // 批量操作仅代选套餐,不代填个人收货地址,也不修改名单或选择记录的签收状态。 + pending.add(selection); + if (pending.size() >= 500) { + dao().insert(pending); + pending.clear(); + } + } + assignedCount++; + } + if (!pending.isEmpty()) { + dao().insert(pending); + } + + // 分批写入仍属于同一事务;写入异常向上抛出,使所有批次一起回滚。 + String message = assignedCount == 0 ? "没有需要分配的未选人员,已选记录保持不变" + : "已为" + assignedCount + "位未选人员分配套餐,已选记录保持不变"; + return Result.success(message, NutMap.NEW() + .addv("assignedCount", assignedCount) + .addv("skippedCount", skippedCount)); + } + + /** + * 检查项目是否具备可执行的选择规则,异常配置不使用前端默认值掩盖。 + */ + private String validateBatchProject(WelfareProject project) { + if (project == null) { + return "福利项目不存在"; + } + if (Boolean.TRUE.equals(project.getIsDisabled())) { + return "福利项目已禁用,不能分配套餐"; + } + if (!"radio".equals(project.getIsCheckBox()) && !"checkBox".equals(project.getIsCheckBox())) { + return "福利项目未配置有效的选择模式"; + } + if ("checkBox".equals(project.getIsCheckBox()) + && (project.getMultiSelectNum() == null || project.getMultiSelectNum() < 1)) { + return "福利项目未配置有效的可选份数"; + } + if (project.getOptions() == null || project.getOptions().isEmpty()) { + return "福利项目尚未配置套餐"; + } + long defaultCount = project.getOptions().stream() + .filter(option -> Boolean.TRUE.equals(option.getIsSystemDefault())) + .count(); + if (defaultCount > 1) { + return "福利项目配置了多个系统默认套餐,请先检查项目配置"; + } + return null; + } + + /** + * 后端独立校验套餐归属、正整数份数、单多选及必选项;不信任前端传入的题目或人员字段。 + */ + private String validateBatchOptions(WelfareProject project, List requestedOptions) { + if (requestedOptions == null || requestedOptions.isEmpty()) { + return "请至少选择一份福利套餐"; + } + boolean single = "radio".equals(project.getIsCheckBox()); + int limit = single ? 1 : project.getMultiSelectNum(); + Set optionIds = project.getOptions().stream() + .map(WelfareProjectSubjectOption::getId) + .collect(Collectors.toSet()); + Set selectedIds = new HashSet<>(); + long total = 0; + for (NutMap option : requestedOptions) { + if (option == null || !optionIds.contains(option.getString("id"))) { + return "所选套餐不属于当前福利项目,请重新打开弹框选择"; + } + if (!selectedIds.add(option.getString("id"))) { + return "同一套餐不能重复提交,请通过份数设置数量"; + } + Object value = option.get("selectNum"); + if (!(value instanceof Number) || !value.toString().matches("[1-9][0-9]*")) { + return "套餐份数必须为正整数"; + } + long quantity; + try { + quantity = Long.parseLong(value.toString()); + } catch (NumberFormatException e) { + return "套餐份数超出允许范围"; + } + if ((single || !Boolean.TRUE.equals(project.getSingleOptionSupportMultipleSelection())) + && quantity > 1) { + return "当前福利项目每个套餐最多选择1份"; + } + if (quantity > limit || total > limit - quantity) { + return "每人选择的套餐总份数不能超过" + limit + "份"; + } + total += quantity; + } + + for (WelfareProjectSubjectOption option : project.getOptions()) { + if (Boolean.TRUE.equals(option.getIsSystemDefault()) && !selectedIds.contains(option.getId())) { + return "系统默认福利“" + option.getOptionName() + "”不可取消"; + } + } + return null; + } + + /** + * 与统计列表保持相同的分工会角色口径,缺失工会信息时拒绝扩大到全校。 + */ + private boolean isBatchBranchRole() { + return AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) + || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name()) + || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name()); + } + + private String validateBatchScope(String unionId) { + if (isBatchBranchRole()) { + String currentUnionId = SecurityUtil.getUnionId(); + if (StrUtil.isBlank(currentUnionId)) { + return "当前账号未关联工会,不能批量分配套餐"; + } + if (StrUtil.isNotBlank(unionId) && !currentUnionId.equals(unionId)) { + return "只能为本工会人员分配套餐"; + } + } + return null; + } + + /** + * 从项目福利名单按人员去重;任一非空套餐记录即视为已选,不补齐或覆盖其原有组合。 + */ + private List batchSelectionUsers(String projectId, String unionId) { + Sql sql = Sqls.create( + "SELECT DISTINCT wl.userId, u.username AS userName, " + + "EXISTS (SELECT 1 FROM welfare_project_user_selection selection " + + "WHERE selection.welfareId = wl.projectId " + + "AND selection.selectUserId = wl.userId " + + "AND selection.selectOptionId IS NOT NULL) AS hasSelected " + + "FROM welfare_list wl " + + "INNER JOIN sys_user u ON u.id = wl.userId " + + "$condition ORDER BY wl.userId" + ); + Cnd condition = Cnd.where("wl.projectId", "=", projectId); + String effectiveUnionId = isBatchBranchRole() ? SecurityUtil.getUnionId() : unionId; + condition.andEX("wl.welfareUnionId", "=", effectiveUnionId); + sql.setCondition(condition); + return listMap(sql); + } + @Override public NutMap pageData(String projectId, String unionId) { // 分工会数据 diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js index 117bc56..d48e678 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js @@ -74,6 +74,7 @@ const filterUser = { + + - - - - - - + diff --git a/src/main/resources/views/platform/zhgh/welfare/statistics/batchSelectDialog.js b/src/main/resources/views/platform/zhgh/welfare/statistics/batchSelectDialog.js new file mode 100644 index 0000000..90dd1d2 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/welfare/statistics/batchSelectDialog.js @@ -0,0 +1,505 @@ +const batchSelectDialog = { + template: /*language=HTML*/ ` +
+ +
+

为尚未选择福利的人员统一分配套餐

+ + + + + + + +
+ + +
+ +
+ `, + data() { + return { + visible: false, + tableLoading: false, + formLoading: false, + projectId: "", + unionId: "", + project: {}, + options: [], + unSelectedCount: 0, + loadError: "", + requestVersion: 0 + } + }, + computed: { + isSingle() { + return this.project.isCheckBox === "radio" + }, + selectionLimit() { + return this.isSingle ? 1 : Number(this.project.multiSelectNum || 0) + }, + systemDefaultOption() { + return this.options.find((option) => option.isSystemDefault) + }, + selectedRadioId() { + const selected = this.options.find((option) => option.selectNum > 0) + return selected ? selected.id : "" + }, + selectedCount() { + return this.options.reduce((total, option) => total + option.selectNum, 0) + }, + ruleText() { + if (this.isSingle) { + return "单选 · 每人选择 1 份" + } + const multipleRule = this.project.singleOptionSupportMultipleSelection + ? "同一套餐可选多份" : "同一套餐最多 1 份" + return "多选 · 每人最多 " + this.selectionLimit + " 份 · " + multipleRule + }, + selectionSummary() { + return this.options + .filter((option) => option.selectNum > 0) + .map((option) => option.optionName + " × " + option.selectNum + " 份") + .join(" + ") + }, + canSubmit() { + return !!this.project.id && !this.loadError && !this.tableLoading && !this.formLoading + && this.unSelectedCount > 0 && this.selectedCount > 0 + && this.selectedCount <= this.selectionLimit + } + }, + methods: { + /** + * projectId 为当前福利项目 ID,unionId 为页面工会筛选。 + * 初始化接口返回 data.project(项目规则及 options)和 data.unSelectedCount(未选人数)。 + * 每次打开重新加载;请求版本号防止关闭后迟到的响应覆盖下一次弹框。 + */ + onOpen(projectId, unionId) { + this.projectId = projectId + this.unionId = unionId || "" + this.project = {} + this.options = [] + this.unSelectedCount = 0 + this.loadError = "" + this.visible = true + this.tableLoading = true + this.requestVersion += 1 + const version = this.requestVersion + return this.$axios.post("/platform/welfare/statistics/batchSelectInfo", { + projectId: this.projectId, + unionId: this.unionId + }) + .then((res) => { + if (version !== this.requestVersion || !this.visible) { + return + } + this.project = res.data.project + this.unSelectedCount = Number(res.data.unSelectedCount) + this.options = this.project.options.map((option) => ({ + ...option, + selectNum: option.isSystemDefault ? 1 : 0 + })) + }) + .catch((error) => { + if (version === this.requestVersion) { + this.loadError = error.msg || error.message || "加载失败,请关闭后重试" + } + }) + .finally(() => { + if (version === this.requestVersion) { + this.tableLoading = false + } + }) + }, + // 提交期间不允许关闭,避免请求仍在执行时再次打开并重复提交。 + onClose(done) { + if (this.formLoading) { + return + } + this.requestVersion += 1 + this.visible = false + this.tableLoading = false + if (typeof done === "function") { + done() + } + }, + imageUrl(value) { + return commonUtil.getFileUrl(value) + }, + // 单选项目按 1 份计数,系统默认套餐存在时不能切换到其他套餐。 + selectSingle(option) { + if (this.formLoading || this.systemDefaultOption) { + return + } + this.options.forEach((item) => { + this.$set(item, "selectNum", item.id === option.id ? 1 : 0) + }) + }, + // 每项上限取项目剩余份数与单项上限的较小值,默认套餐保留至少 1 份。 + optionMax(option) { + const perOptionLimit = this.project.singleOptionSupportMultipleSelection ? this.selectionLimit : 1 + const remaining = this.selectionLimit - this.selectedCount + option.selectNum + return Math.max(option.isSystemDefault ? 1 : 0, Math.min(perOptionLimit, remaining)) + }, + changeQuantity(option, value) { + if (this.formLoading) { + return + } + const minimum = option.isSystemDefault ? 1 : 0 + const quantity = Number(value) + if (!Number.isInteger(quantity)) { + this.$set(option, "selectNum", minimum) + return + } + this.$set(option, "selectNum", Math.max(minimum, Math.min(this.optionMax(option), quantity))) + }, + /** + * 只提交套餐 ID 和每人份数;人员、题目归属及有效规则由后端重新核验。 + * 返回 Result.data.assignedCount 为实际分配人数,skippedCount 为范围内已选人数。 + */ + submit() { + if (!this.canSubmit) { + return + } + const selectedOptions = this.options + .filter((option) => option.selectNum > 0) + .map((option) => ({ + id: option.id, + selectNum: option.selectNum + })) + this.formLoading = true + return this.$axios.post("/platform/welfare/statistics/doSelectByAdmin", { + projectId: this.projectId, + unionId: this.unionId, + welfareOptions: JSON.stringify(selectedOptions) + }) + .then((res) => { + this.$message.success(res.msg) + this.visible = false + this.$emit("success") + }) + .catch(() => { + // 全局拦截器已显示接口错误,保留当前选择供用户检查或重试。 + }) + .finally(() => { + this.formLoading = false + }) + } + }, + style: /*language=CSS*/ ` + /deep/ .welfare-batch-dialog .el-dialog { + display: flex; + flex-direction: column; + max-width: calc(100vw - 40px); + max-height: 88vh; + } + + /deep/ .welfare-batch-dialog .el-dialog__header { + flex-shrink: 0; + } + + /deep/ .welfare-batch-dialog .el-dialog__title { + font-weight: 600; + } + + /deep/ .welfare-batch-dialog .el-dialog__body { + min-height: 0; + padding: 0 24px 12px; + overflow-y: auto; + } + + /deep/ .welfare-batch-subtitle { + margin: 0 0 20px; + color: #909399; + } + + /deep/ .welfare-batch-dialog .el-alert--info { + background-color: #ecf5ff; + color: #409eff; + } + + /deep/ .welfare-batch-error { + margin-top: 16px; + } + + /deep/ .welfare-batch-overview { + display: flex; + align-items: center; + gap: 24px; + margin: 22px 0; + } + + /deep/ .welfare-batch-project { + display: flex; + flex: 1; + gap: 16px; + min-width: 0; + } + + /deep/ .welfare-batch-project > span { + flex-shrink: 0; + } + + /deep/ .welfare-batch-project strong { + overflow-wrap: anywhere; + } + + /deep/ .welfare-batch-people { + display: flex; + align-items: center; + flex-shrink: 0; + gap: 16px; + } + + /deep/ .welfare-batch-people strong { + font-size: 20px; + color: #409eff; + } + + /deep/ .welfare-batch-rules { + padding: 14px 16px; + border-radius: 4px; + background: #f5f7fa; + line-height: 26px; + } + + /deep/ .welfare-batch-heading { + display: flex; + justify-content: space-between; + align-items: center; + gap: 12px; + margin: 20px 0 12px; + } + + /deep/ .welfare-batch-heading > strong { + font-size: 16px; + } + + /deep/ .welfare-batch-heading b { + color: #409eff; + } + + /deep/ .welfare-batch-options { + max-height: 340px; + overflow-y: auto; + } + + /deep/ .welfare-batch-option { + display: flex; + align-items: center; + gap: 14px; + padding: 12px 16px; + border: 1px solid #dcdfe6; + border-radius: 4px; + } + + /deep/ .welfare-batch-option + .welfare-batch-option { + margin-top: 10px; + } + + /deep/ .welfare-batch-option.is-selected { + border-color: #409eff; + background: #ecf5ff; + } + + /deep/ .welfare-batch-option .el-radio { + margin-right: 0; + } + + /deep/ .welfare-batch-option .el-radio__label { + padding-left: 0; + } + + /deep/ .welfare-batch-radio-label { + position: absolute; + width: 1px; + height: 1px; + overflow: hidden; + clip-path: inset(50%); + } + + /deep/ .welfare-batch-image { + width: 64px; + height: 64px; + flex-shrink: 0; + border-radius: 4px; + } + + /deep/ .welfare-batch-image-empty { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + background: #f5f7fa; + color: #c0c4cc; + font-size: 24px; + } + + /deep/ .welfare-batch-option-content { + flex: 1; + min-width: 0; + line-height: 24px; + overflow-wrap: anywhere; + } + + /deep/ .welfare-batch-option-title { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 8px; + } + + /deep/ .welfare-batch-option .el-input-number { + flex-shrink: 0; + width: 130px; + } + + /deep/ .welfare-batch-selected { + flex-shrink: 0; + color: #409eff; + } + + /deep/ .welfare-batch-muted { + color: #909399; + font-size: 13px; + line-height: 22px; + } + + /deep/ .welfare-batch-limit { + margin: 10px 0 0; + } + + /deep/ .welfare-batch-summary { + margin-top: 18px; + padding-top: 14px; + border-top: 1px solid #ebeef5; + line-height: 26px; + overflow-wrap: anywhere; + } + + /deep/ .welfare-batch-summary strong span { + color: #409eff; + } + + /deep/ .welfare-batch-dialog .el-dialog__footer { + flex-shrink: 0; + padding: 14px 24px 20px; + border-top: 1px solid #ebeef5; + } + ` +} diff --git a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html index 58314f2..980ed92 100644 --- a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html @@ -45,6 +45,14 @@ layout("/layouts/platform.html"){ 导出汇总表 + + 一键分配套餐 + +