From c2acc64afa0b8f5b3db419fd4361bd5b071c6384 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Tue, 23 Dec 2025 15:59:22 +0800 Subject: [PATCH] commit --- .../ActivityBudgetApplyListController.java | 11 ++++++-- .../TeacherCongressMeetingController.java | 1 + .../WelfareUserSelectController.java | 2 +- .../activityBudget/applyList/index.html | 2 +- .../proposal/transact/write/index.html | 2 +- .../teachercongress/meetings/index.html | 16 ++++++++++- .../platform/zhgh/welfare/select/index.html | 1 - .../zhgh/welfare/select/optionSelect.js | 11 ++++---- .../proposal/transact/write/index.html | 28 +++++++++++++------ .../views/platform/zhghh5/sys/home/home.js | 4 +++ .../platform/zhghh5/welfare/select/index.html | 20 +++++++++---- 11 files changed, 71 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java index 74c112a..6526503 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java @@ -8,6 +8,7 @@ import com.budwk.app.base.annotation.SLog; 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.flow.engine.FlowEngine; import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudgetDetails; import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService; @@ -45,7 +46,8 @@ public class ActivityBudgetApplyListController { @Inject private ActivityBudgetService activityBudgetService; - + @Inject + private FlowEngine flowEngine; @At("") @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html") @@ -53,7 +55,6 @@ public class ActivityBudgetApplyListController { public void index() { } - @At @ApiOperation("分页查询") @SaCheckPermission("activity.budget.applyList") @@ -72,6 +73,10 @@ public class ActivityBudgetApplyListController { if (ObjectUtil.isNotEmpty(ids)) { activityBudgetService.clear(Cnd.where("id", "in", ids)); activityBudgetService.dao().clear(ActivityBudgetDetails.class, Cnd.where("budgetId", "in", ids)); + + for (String id : ids) { + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + } } return Result.success(); } @@ -84,6 +89,8 @@ public class ActivityBudgetApplyListController { public Result doDelete(String id) { activityBudgetService.dao().delete(ActivityBudget.class, id); activityBudgetService.dao().clear(ActivityBudgetDetails.class, Cnd.where("budgetId", "=", id)); + + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java index 88cc889..2392588 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java @@ -7,6 +7,7 @@ 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.democratic.teachercongress.meetings.models.Teacher_congress_meeting; +import com.budwk.app.zhgh.democratic.teachercongress.meetings.models.Teacher_congress_meeting_file; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; 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 44dbddf..4bc86b9 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 @@ -72,7 +72,7 @@ public class WelfareUserSelectController { cnd.andEX("YEAR(wp.choiceTimeStart)", "in", year); cnd.and("wp.isDisabled", "=", 0); cnd.groupBy("wp.id"); - cnd.desc("YEAR(wp.choiceTimeStart)"); + cnd.desc("wp.choiceTimeStart"); sql.setCondition(cnd); Pagination pagination = welfareProjectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html index e8b9e60..6180adb 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html @@ -104,7 +104,7 @@ layout("/layouts/platform.html"){ 撤回 + v-if="row.taskKey === 'startTask' || !row.instanceId || $auth.hasRole('SYSADMIN')"> 删除 diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html index 2b2a17d..cfa1a26 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html @@ -410,7 +410,7 @@ layout("/layouts/platform.html"){ } }) } else { - // this.noticeDialogVisible = true + this.noticeDialogVisible = true this.listOpenSession(false) this.$set(this.formData, "createUserId", this.$store.state.user.id) diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html index d0cdff2..31e4ca7 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html @@ -59,7 +59,7 @@ layout("/layouts/platform.html"){ @@ -204,6 +204,20 @@ layout("/layouts/platform.html"){ } }, methods: { + doDelete(id) { + this.$confirm("您确定要删除吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + $.post(loc() + "/delete", { id }).then((res) => { + if (res.code === 0) { + this.$message.success(res.msg) + this.doSearch() + } + }) + }) + }, openAdd() { this.formData = { userId: this.$store.state.user.id, diff --git a/src/main/resources/views/platform/zhgh/welfare/select/index.html b/src/main/resources/views/platform/zhgh/welfare/select/index.html index 3c7d6e4..59f643b 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/select/index.html @@ -388,7 +388,6 @@ layout("/layouts/platform.html"){ top: 8px; right: 8px; z-index: 2; - padding: 4px 8px; border-radius: 12px; font-size: 12px; font-weight: 500; diff --git a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js index 232d0b0..2cd25a3 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js +++ b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js @@ -143,8 +143,8 @@ const optionSelect = {
联系信息
- - + - - 添加地址 + + 添加地址 - +
@@ -331,15 +344,12 @@ layout("/layouts/platform_h5.html"){
- +
- +