活动类型、使用费用

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

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)

src/main/java/com/budwk/app/zhgh/activity/culture/service/ActivityCultureService.java

@@ -21,7 +21,7 @@ public interface ActivityCultureService extends BaseService<ActivityTissue> {
 
     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);
 }

src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java

@@ -80,7 +80,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
     }
 
     @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<ActivityTissue>
         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(),

src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js

@@ -140,6 +140,19 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                                             </el-form-item>
                                         </el-col>
 
+                                        <el-col :span="12" v-if="!formData.isEnrollSystem">
+                                            <el-form-item label="使用费用" prop="money">
+                                                <el-input-number
+                                                        :min="0"
+                                                        :precision="2"
+                                                        :step="0.01"
+                                                        placeholder="请填写使用费用"           
+                                                        style="width: 100%"
+                                                        v-model="formData.money">
+                                                </el-input-number>
+                                            </el-form-item>
+                                        </el-col>
+
                                         <el-col :span="12">
                                             <el-form-item label="参加人员范围" prop="groupId">
                                                 <div style="display: flex; justify-content: space-between">

src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js

@@ -44,6 +44,9 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
                 <el-descriptions-item label="活动地点">
                     {{ viewData.address }}
                 </el-descriptions-item>
+                <el-descriptions-item label="使用费用">
+                    {{ viewData.money || '暂无' }}
+                </el-descriptions-item>
                 <el-descriptions-item label="报名方式">
                     <span v-if="viewData.signUpMethod===1">个人报名</span>
                     <span v-else-if="viewData.signUpMethod===2">组队报名</span>

src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js

@@ -23,6 +23,23 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                             <el-input clearable placeholder="请输入活动名称"
                                       v-model="pageForm.name"></el-input>
                         </search-item>
+                        
+                        <search-item label="活动类型">
+                            <el-select filterable placeholder="请选择活动类型" style="width: 100%"
+                                       v-model="pageForm.projectTypeCode" clearable>
+                                <el-option
+                                    :key="item.code"
+                                    :label="item.name+' ('+item.code+')'"
+                                    :value="item.code"
+                                    v-for="item in activityTypeList">
+                                </el-option>
+                            </el-select>
+                        </search-item>
+                        
+                        <search-item label="使用费用">
+                            <el-input clearable placeholder="请输入使用费用"
+                                      v-model="pageForm.money"></el-input>
+                        </search-item>
                     </search>
                 </el-card>
         
@@ -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()
     }
 }