zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

Browse Source
main
喻忠伟 4 months ago
parent f7b1467d3d b55f0263ca
commit f78d5dda2f
4 changed files with 39 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
  2. 16
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitPass.vue
  3. 16
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitReject.vue
  4. 20
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue

10
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
Unescape View File

@ -471,11 +471,19 @@ public class AnnualCompetitionProjectRegistrationController {
//判断队伍人数是否合格
AnnualCompPoint compPoint = annualCompPointService.query().eq("id", info.getAnnualCompid()).one();
//只有是团队赛的时候才进行判断，个人赛值判断是不是自己一个人
if (compPoint.getEntryForm().equals("Y")) {
if (managements.size() != compPoint.getTeamNumber())
return Result.error("队伍人数要求" + compPoint.getTeamNumber() + "人,请重新组队");
if (instructorSheetList.size() != compPoint.getTeacherNumber())
return Result.error("老师人数要求" + compPoint.getTeacherNumber() + "人,请重新选择");
} else if (compPoint.getEntryForm().equals("N")) {
if (managements.size() >1){
return Result.error("个人赛只能一个人参加");
} else if ( !managements.get(0).getUserId().equals(loginUser.getId())) {
return Result.error("你只能为你自己报名");
}
}
//判断队员是否已经参加这个比赛
int i = 1;
for (TeamManagement management : managements) {

16
jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitPass.vue
Unescape View File

@ -12,25 +12,25 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>
<!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>-->
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
<!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
导入
</j-upload-button>
</j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<!-- <a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu-item>-->
</a-menu>
</template>
<a-button>批量操作
<!-- <a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-button>-->
</a-dropdown>
</template>
<!--操作栏-->

16
jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitReject.vue
Unescape View File

@ -12,25 +12,25 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>
<!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>-->
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
<!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
导入
</j-upload-button>
</j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<!-- <a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu-item>-->
</a-menu>
</template>
<a-button>批量操作
<!-- <a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-button>-->
</a-dropdown>
</template>
<!--操作栏-->

20
jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue
Unescape View File

@ -12,25 +12,25 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>
<!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>-->
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
<!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
导入
</j-upload-button>
</j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<!-- <a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu-item>-->
</a-menu>
</template>
<a-button>批量操作
<!-- <a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-button>-->
</a-dropdown>
</template>
<!--操作栏-->
@ -276,13 +276,13 @@ function getTableAction(record) {
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
}, /*{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
},
},*/
];
return actions;
}

Write Preview
Loading…
Cancel
Save