From 5ebbab9f52b9338cc1360fa546fdf4f43c79de5d Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 4 Dec 2025 17:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=B4=B9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityCultureInfoManageController.java | 4 ++- .../culture/models/ActivityTissue.java | 5 +++ .../service/ActivityCultureService.java | 2 +- .../impl/ActivityCultureServiceImpl.java | 6 +++- .../activity/culture/common/applyActivity.js | 13 ++++++++ .../activity/culture/common/infoActivity.js | 3 ++ .../zhgh/activity/culture/common/infoMange.js | 31 ++++++++++++++++++- 7 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java index b7f3ab5..cfa3891 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java @@ -65,9 +65,11 @@ public class ActivityCultureInfoManageController { @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.union", "activity.culture.infoManage.club"}, mode = SaMode.OR) public Result pageData(PageForm page, String year, String name, + Double money, String unionId, + String projectTypeCode, @Valid Integer activity_type) { - return Result.success(activityCultureService.pageData(page, year, name, unionId, activity_type)); + return Result.success(activityCultureService.pageData(page, year, name,money, unionId, projectTypeCode, activity_type)); } @At 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 943a667..d8cb5fe 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 @@ -109,6 +109,11 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo @ColDefine(type = ColType.INT, width = 6) private Integer peopleNum; + @Column + @Comment("使用费用") + @ColDefine(type = ColType.FLOAT) + private Double money; + @Column @Comment("活动地点") @ColDefine(type = ColType.VARCHAR, width = 200) 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 8c38bed..f739ceb 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 @@ -21,7 +21,7 @@ public interface ActivityCultureService extends BaseService { void doEditActivity(ActivityTissue tissue); - Object pageData(PageForm page, String year, String name, String unionId, Integer activity_type); + Object pageData(PageForm page, String year, String name,Double money, String unionId, String projectTypeCode, Integer activity_type); NutMap findOne(String id); } 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 a8bd3c3..7d88a4e 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 @@ -80,7 +80,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl } @Override - public Object pageData(PageForm page, String year, String name, String unionId, Integer activity_type) { + public Object pageData(PageForm page, String year, String name,Double money, String unionId, String projectTypeCode, Integer activity_type) { Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" @@ -119,11 +119,15 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl cnd.andEX("YEAR(tissue.applyTime)", "=", year); cnd.andEX("tissue.projectTypeCode", "!=", "50004"); cnd.andEX("tissue.unionId", "=", unionId); + cnd.andEX("tissue.projectTypeCode", "=", projectTypeCode); cnd.andEX("tissue.activity_type", "=", activity_type); if (Strings.isNotBlank(name)) { cnd.where().andLike("tissue.name", name); } + if (money != null) { + cnd.and("tissue.money", "<=", money); + } SqlExpressionGroup group = new SqlExpressionGroup(); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index 451cbd9..b731037 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -140,6 +140,19 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { + + + + + + +
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js index 515b762..7688435 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js @@ -44,6 +44,9 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = { {{ viewData.address }} + + {{ viewData.money || '暂无' }} + 个人报名 组队报名 diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js index ac79b02..59461fc 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js @@ -23,6 +23,23 @@ const ACTIVITY_CULTURE_INFO_MANAGE = { + + + + + + + + + + + @@ -161,6 +178,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = { mixins: [initTableMixins], data() { return { + activityTypeList: [], codeDialogVisible: false, pageForm: { year: new Date().getFullYear() + "" @@ -264,7 +282,11 @@ const ACTIVITY_CULTURE_INFO_MANAGE = { } }) this.tableLoading = false - } + }, + async getActivityTwoLevelType(code) { + const {data} = await this.$axios.post("/platform/activity/basic/settings/getActivityTwoLevelType", {code: code}) + return data + }, }, async created() { // 根据 activity_type 动态添加流程相关列 @@ -274,6 +296,13 @@ const ACTIVITY_CULTURE_INFO_MANAGE = { {prop: "instanceState", label: "流程状态"} ); } + this.getActivityTwoLevelType("50000").then((data) => { + data.forEach((v) => { + if (v.code !== "50004") { + this.activityTypeList.push(v) + } + }) + }) this.pageData() } }