From 5985ba54edb537c3d9c8bbca2590cc4227be923e Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 31 Dec 2025 08:57:55 +0800 Subject: [PATCH 1/2] commit --- .../ActivityReimbursementApplyController.java | 12 ++++++++---- .../reimbursement/apply/index.html | 1 + .../reimbursement/branchunion/index.html | 2 +- .../reimbursement/clubprincipal/index.html | 2 +- .../reimbursement/mine/index.html | 2 +- .../zhgh/dayofficework/outlay/activityBudget/info.js | 4 +++- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java index f337320..edc14c0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java @@ -223,6 +223,8 @@ public class ActivityReimbursementApplyController { dao.execute(reiSql); List reiDecIdList = reiSql.getList(String.class); + reiDecIdList = reiDecIdList.stream().filter(v -> StrUtil.isNotBlank(v)).toList(); + Cnd cnd = Cnd.NEW(); cnd.and("outlayManageSource", "=", outlayManageSource); if (Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_TWO")) { @@ -236,6 +238,8 @@ public class ActivityReimbursementApplyController { dao.execute(sql); List declareIdList = sql.getList(String.class); + declareIdList = declareIdList.stream().filter(v -> StrUtil.isNotBlank(v)).toList(); + Sql applySql = Sqls.create(""" SELECT info.* @@ -248,12 +252,12 @@ public class ActivityReimbursementApplyController { if (Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_TWO")) { applyCnd.and("info.unionId", "=", SecurityUtil.getUnionId()); - activityType="BRANCH_UNION"; + activityType = "BRANCH_UNION"; } else if (Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_THREE")) { applyCnd.and("info.clubId", "=", clubId); - activityType="CLUB"; - }else{ - activityType="SCHOOL_UNION"; + activityType = "CLUB"; + } else { + activityType = "SCHOOL_UNION"; } applyCnd.and("info.activityType", "=", activityType); if (Lang.isNotEmpty(declareIdList)) { diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html index 4ba0a94..59deba5 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html @@ -510,6 +510,7 @@ layout("/layouts/platform.html"){ this.formData.activityTime = [res.data.startTime, res.data.endTime] } this.getBudgetByYear() + this.getActivityReimbursementByUser() } }) }, diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html index 3dba75c..9a3f4dc 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html @@ -160,7 +160,7 @@ layout("/layouts/platform.html"){ {prop: "actualMoney", label: "报销金额（元）"}, {prop: "declareUnitName", label: "申报单位/协会", sortable: true}, {prop: "applyTime", label: "申报时间", sortable: true}, - {prop: "taskName", label: "当前节点"}, + {prop: "curTaskName", label: "当前节点"}, {prop: "instanceState", label: "流程状态"} ], activityDeclareReimbursementList: [], diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html index b800c2d..cb8e936 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html @@ -151,7 +151,7 @@ layout("/layouts/platform.html"){ {prop: "actualMoney", label: "报销金额（元）"}, {prop: "declareUnitName", label: "申报单位/协会", sortable: true}, {prop: "applyTime", label: "申报时间", sortable: true}, - {prop: "taskName", label: "当前节点"}, + {prop: "curTaskName", label: "当前节点"}, {prop: "instanceState", label: "流程状态"} ], activityDeclareReimbursementList: [], diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html index 69c4c78..44be8f3 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html @@ -55,7 +55,7 @@ layout("/layouts/platform.html"){ - 活动申报 + 报销申请
-
{{ task.displayName }}
+
+ {{ task.displayName }} +
{{ task.ext.initiatorName From 402167dfb9478f1c7ea5b74a51a8b58338a0df99 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 31 Dec 2025 09:00:36 +0800 Subject: [PATCH 2/2] commit --- .../reimbursement/apply/index.html | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html index 59deba5..7d17f21 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html @@ -515,34 +515,37 @@ layout("/layouts/platform.html"){ }) }, initBudgetType() { - this.budgetTypeOption = this.dict.type.ACTIVITY_BUDGET_TYPE - const budgetTypeCloseOption = [] - if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { + this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE").then(resp => { + this.budgetTypeOption = resp + const budgetTypeCloseOption = [] + if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { - } else { - if (this.$auth.hasRoleOr(["SCHOOL_REIMBURSEMENT_MANAGER"])) { - this.budgetTypeOption.map(v => { - if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) { - budgetTypeCloseOption.push(v) - } - }) + } else { + if (this.$auth.hasRoleOr(["SCHOOL_REIMBURSEMENT_MANAGER"])) { + this.budgetTypeOption.map(v => { + if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) { + budgetTypeCloseOption.push(v) + } + }) + } + if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) { + this.budgetTypeOption.map(v => { + if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) { + budgetTypeCloseOption.push(v) + } + }) + } + if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER", "CLUB_PRESIDENT"])) { + this.budgetTypeOption.map(v => { + if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) { + budgetTypeCloseOption.push(v) + } + }) + } + this.budgetTypeOption = budgetTypeCloseOption } - if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) { - this.budgetTypeOption.map(v => { - if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) { - budgetTypeCloseOption.push(v) - } - }) - } - if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER", "CLUB_PRESIDENT"])) { - this.budgetTypeOption.map(v => { - if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) { - budgetTypeCloseOption.push(v) - } - }) - } - this.budgetTypeOption = budgetTypeCloseOption - } + }) + }, }, async created() {