From a9f89d25f0afc376f466c127f35a8559ebd78cfc Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 23:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E5=AF=BC=E5=85=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AwardPersionController.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java index acfbb31a..0e9babc7 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java @@ -539,10 +539,23 @@ public class AwardPersionController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap()); queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode()); List listtm = teamManagementService.list(queryWrappertm); - if(annualService.getannualthisid(list.get(i).getAnnualid())==null){ + String nd = annualService.getannualthisid(list.get(i).getAnnualid()); + if(nd==null){ return Result.error("文件导入失败:第"+(i+1)+"行年度不存在"); }else{ - list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid())); + list.get(i).setAnnualid(nd); + } + QueryWrapper queryWrapperndbs = new QueryWrapper<>(); + queryWrapperndbs.eq("name",list.get(i).getAnnalComp()); + List listndbs = annualCompService.list(queryWrapperndbs); + if(listndbs.size()==0){ + return Result.error("文件导入失败:第"+(i+1)+"行年度比赛不存在"); + } + QueryWrapper queryWrapperndbsxm = new QueryWrapper<>(); + queryWrapperndbsxm.eq("obj_name",list.get(i).getAnnualCompP()); + List listndbsxm = annualCompPointService.list(queryWrapperndbsxm); + if(listndbsxm.size()==0){ + return Result.error("文件导入失败:第"+(i+1)+"行年度比赛项目不存在"); } try { for (int l = 0 ; l < listtm.size() ; l++){