Merge remote-tracking branch 'origin/gst4base' into gst4base

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java

@@ -76,7 +76,7 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
     public Result<IPage<AnnualCompAward>> queryPageList(AnnualCompAward annualCompAward,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        HttpServletRequest req) {
+                                                        HttpServletRequest req,@RequestParam(name = "acpid", required = true) String acpid) {
 
         Subject subject = SecurityUtils.getSubject();
         // 获取当前登录用户
@@ -104,7 +104,8 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
             if (ObjectUtils.isEmpty(compList)) {
                 return Result.OK(page);
             }
-            //获取比赛ID
+            queryWrapper.eq(AnnualCompAward::getAnnucompid,acpid);
+ /*           //获取比赛ID
             Set<String> compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet());
             //根据比赛ID查询年度必死啊
             List<AnnualComp> annualCompList = annualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(AnnualComp::getCompid, compIds));
@@ -118,9 +119,8 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
                     Set<String> annualCompPointIds = annualCompPointList.stream().map(e -> e.getId()).collect(Collectors.toSet());
                     queryWrapper.in(AnnualCompAward::getAnnucompid, annualCompPointIds);
                 }
-            }
+            }*/
         }
-
         annualCompAwardService.page(page, queryWrapper);
 
 //        Page<AnnualCompAwardvo> page1 = new Page<>();

jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-box">
-    <a-card title="年度比赛管理" :bordered="false" style="height: 100%">
+    <a-card title="年度比赛项目管理" :bordered="false" style="height: 100%">
       <div class="filter-search">
         <div class="left">
           <ul>
@@ -18,7 +18,7 @@
       <div class="race-box">
         <div class="add-race item" @click="handleAdd">
           <PlusOutlined style="font-size: 22px" />
-          <div>点击添加比赛</div>
+          <div>点击添加项目</div>
         </div>
         <cardItem
           v-for="item in raceList"
@@ -106,12 +106,12 @@
   };
 
   // 获取年度
-  const yearList = ref<any>([{ title: '全部比赛', value: '' }]);
+  const yearList = ref<any>([{ title: '全部项目', value: '' }]);
   const getDictItemsEvent = async () => {
     const date = new Date().getTime();
     const res = await getDictItems('annual,annual_name,id?_t=' + date);
     yearList.value = res.reverse();
-    yearList.value.unshift({ title: '全部比赛', value: '' });
+    yearList.value.unshift({ title: '全部项目', value: '' });
   };
   getDictItemsEvent();
 

jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAwardList.vue

@@ -54,6 +54,7 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AnnualCompAward.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import {useRoute} from "vue-router";
+  const route = useRoute()
 
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
@@ -73,6 +74,9 @@
         fieldMapToNumber: [],
         fieldMapToTime: [],
       },
+      beforeFetch: (params) => {
+        return Object.assign(params, {acpid:route.query.acpid});
+      },
       actionColumn: {
         width: 120,
         fixed: 'right',
@@ -89,7 +93,6 @@
   });
 
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
-const route = useRoute()
   /**
    * 新增事件
    */