From 7828fa6c86190f5ab0d94cc78fc3c56d981149ac Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 27 Aug 2024 16:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B9=B3=E5=9D=87=E5=88=86?= =?UTF-8?q?=E9=85=8D=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnualCompGroupController.java | 6 +++--- .../src/views/annualcompgroup/AnnualCompGroup.api.ts | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java index edbb7b0b..f49f625b 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java @@ -383,14 +383,14 @@ public class AnnualCompGroupController extends JeecgController listact = annComGroTopPService.list(queryWrapperagt); - String str = ""; + annComGroTopPService.remove(queryWrapperagt); +/* String str = ""; for (int i = 0; i < listact.size(); i++) { str = str + listact.get(i).getBmcode() + ","; } if (str != "") { queryWrapperup.notIn("apply_code", str.split(",")); - } + }*/ List listup = upfilePersionService.list(queryWrapperup); //作品的年度比赛项目必须和组的年度比赛项目相同才可以分配作品 for (int o = 0; o < listup.size(); o++) { diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts index 8616152f..0e98f3cb 100644 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts +++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts @@ -17,8 +17,16 @@ enum Api { } export const zdfpzp = () => { - let url = Api.zdfpzp; - return defHttp.get({ url: url}, { isTransformResponse: false }); + createConfirm({ + iconType: 'warning', + title: '确认自动分配作品', + content: '会清空已分配作品，重新进行分配', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.get({ url: Api.zdfpzp}, { isTransformResponse: true }); + } + }); } /**