From 360eb3d9e66e0e14662c5aac24616da817fe524c Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 9 Dec 2025 17:18:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E9=A1=B9=E7=9B=AE=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WelfareMineController.java | 1 + .../WelfareProjectMangeController.java | 12 ++++++++++ .../WelfareUserSelectController.java | 1 + .../zhgh/welfare/model/WelfareProject.java | 5 ++++ .../zhgh/welfare/projectMange/index.html | 24 ++++++++++++++++++- 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java index d082fef..c7ba11c 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java @@ -83,6 +83,7 @@ public class WelfareMineController { cnd.and("wp.isDisabled", "=", 0); cnd.andEX("YEAR(wp.choiceTimeStart)", "=", year); cnd.andEX("wl.userId", "=", SecurityUtil.getUserId()); + cnd.andEX("wp.isUnseal", "=", true); cnd.desc("wp.choiceTimeStart"); cnd.groupBy("wl.id"); sql.setCondition(cnd); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java index 6fad271..a81d3c0 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.welfare.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; @@ -80,6 +81,7 @@ public class WelfareProjectMangeController { if (StrUtil.isNotBlank(project.getId())) { projectService.updateProject(project); } else { + project.setIsUnseal(false); projectService.saveProject(project); } return Result.success(); @@ -146,4 +148,14 @@ public class WelfareProjectMangeController { return Result.success(); } + @At + @SaCheckPermission("welfare.project.mange") + public Result welfareStatusChange(@Valid String id, @Valid Boolean isUnseal) { + projectService.update(Chain.make("isUnseal", isUnseal), Cnd.where("id", "=", id)); + projectService.dao().update(WelfareProject.class, + Chain.make("isUnseal", isUnseal), + Cnd.where("id", "=", id)); + return Result.success(); + } + } 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 ba28055..68e92b7 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 @@ -70,6 +70,7 @@ public class WelfareUserSelectController { cnd.andEX("YEAR(wp.choiceTimeStart)", "in", year); cnd.and("wp.isDisabled", "=", 0); cnd.groupBy("wp.id"); + cnd.andEX("wp.isUnseal", "=", true); cnd.desc("YEAR(wp.choiceTimeStart)"); sql.setCondition(cnd); Pagination pagination = welfareProjectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java index ccb9427..19eef53 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java @@ -74,6 +74,11 @@ public class WelfareProject extends BaseModel implements SysHomeConvert { @ColDefine(type = ColType.DATETIME) private Date choiceTimeEnd; + @Column + @Comment("是否开启") + @ColDefine(type = ColType.BOOLEAN) + private Boolean isUnseal; + @Column @Comment("逾期补发结束时间") @ColDefine(type = ColType.DATETIME) diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html index f89b8ff..26b8397 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html @@ -51,6 +51,14 @@ layout("/layouts/platform.html"){ show-overflow-tooltip v-for="column in tableColumns" > + @@ -261,7 +269,8 @@ layout("/layouts/platform.html"){ { prop: "year", label: "年度" }, { prop: "name", label: "项目名称" }, { prop: "choiceTimeStart", label: "开始选择时间" }, - { prop: "choiceTimeEnd", label: "结束选择时间" } + { prop: "choiceTimeEnd", label: "结束选择时间" }, + {prop: "isUnseal", label: "是否开启"}, // { prop: "gift", label: "福利礼品" }, // { prop: "provideTimeStart", label: "发放时间" } @@ -296,6 +305,19 @@ layout("/layouts/platform.html"){ this.sendMsg(data) } }, + async welfareStatusChange(id, isUnseal) { + + const resp = await this.$axios.post("/platform/welfare/project/mange/welfareStatusChange", { + id: id, + isUnseal: isUnseal + }) + if (resp.code === 0) { + this.doSearch() + this.$message.success(resp.msg) + } else { + this.$message.error(resp.msg) + } + }, async save() { const formValid = await this.$refs["form"].validate() if (formValid) {