From d26e441fbb7e661a8bfa4ae593c374c8d7604830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 29 Jul 2024 15:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=B9=B4=E5=BA=A6=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AnnualCompController.java      |  6 ++++++
 .../annualcomp/annualcomp/AnnualComp.data.ts  | 19 ++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
index fe8eb3d7..3859e459 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
@@ -122,6 +122,12 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
         {
             queryWrapper.in("compid",needlist);
             IPage<AnnualComp> pageList = annualCompService.page(page, queryWrapper);
+            for(int i=0;i<pageList.getRecords().size();i++){
+                Comp comp = compService.getById(pageList.getRecords().get(i).getCompid());
+                pageList.getRecords().get(i).setCompid(comp.getCompName());
+                Annual annual = annualService.getById(pageList.getRecords().get(i).getAnnualid());
+                pageList.getRecords().get(i).setAnnualid(annual.getAnnualName());
+            }
             return Result.OK(pageList);
         }else
         {
diff --git a/jeecgboot-vue3-master/src/views/annualcomp/annualcomp/AnnualComp.data.ts b/jeecgboot-vue3-master/src/views/annualcomp/annualcomp/AnnualComp.data.ts
index cb41ba10..c58730d0 100644
--- a/jeecgboot-vue3-master/src/views/annualcomp/annualcomp/AnnualComp.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualcomp/annualcomp/AnnualComp.data.ts
@@ -7,12 +7,12 @@ export const columns: BasicColumn[] = [
   {
     title: '比赛名称',
     align: 'center',
-    dataIndex: 'compname',
+    dataIndex: 'compid',
   },
   {
     title: '年度名称',
     align: 'center',
-    dataIndex: 'annualname',
+    dataIndex: 'annualid',
   },
   {
     title: '赛次',
@@ -24,11 +24,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'name',
   },
-  {
+/*  {
     title: '年度比赛状态',
     align: 'center',
     dataIndex: 'state_dictText',
-  },
+  },*/
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -66,7 +66,7 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
+/*  {
     label: '比赛名称',
     field: 'compname',
     component: 'JPopup',
@@ -83,7 +83,16 @@ export const formSchema: FormSchema[] = [
     dynamicRules: ({ model, schema }) => {
       return [{ required: true, message: '请输入比赛名称!' }];
     },
+  },*/
+
+  {
+    label: '比赛名称',
+    field: 'compid',
+    component: 'Input',
   },
+
+
+
   {
     label: '年度名称',
     field: 'annualid',