From 7c3e917d970506a37b11a5b2b55ee4eacf3a613b Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 22:10:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8A=A5=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 | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 7bcc2424..91e6e9dd 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 @@ -18,6 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; +import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; @@ -96,6 +97,8 @@ public class AwardPersionController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap()); queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode()); List listtm = teamManagementService.list(queryWrappertm); + try { + list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid())); + }catch (Exception e){ + return Result.error("文件导入失败:第"+(i+1)+"行年度不存在"); + } + try { for (int l = 0 ; l < listtm.size() ; l++){ SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId()); list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getId()); + if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){ list.get(i).setAwardsort(1); list.get(i).setAwardid(listaca.get(0).getId()); From 818d6a1943ba6ca8880edbc57a919820895bdc07 Mon Sep 17 00:00:00 2001 From: significative <163999932+significative@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:10:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A6=81=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AwardPersionModal.vue | 131 +++++++++--------- 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue b/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue index 7380cc03..b2f7493c 100644 --- a/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue +++ b/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue @@ -1,77 +1,82 @@ From 3e7dd7ad222277b96df02433c740a1f7a09e40ce Mon Sep 17 00:00:00 2001 From: fhv Date: Tue, 30 Jul 2024 22:17:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DepartCompTotalScoreServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java index d5e4b482..e1b884b4 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.annualScore.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.demo.annualScore.entity.DepartCompTotalScore; import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore; @@ -9,10 +10,10 @@ import org.jeecg.modules.demo.annualScore.service.IDepartCompTotalScoreService; import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.util.ObjectUtils; +import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.Date; import java.util.List; @@ -44,10 +45,14 @@ public class DepartCompTotalScoreServiceImpl extends ServiceImpl Date: Tue, 30 Jul 2024 22:43:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../awardpersion/controller/AwardPersionController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 91e6e9dd..acfbb31a 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,12 +539,11 @@ public class AwardPersionController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap()); queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode()); List listtm = teamManagementService.list(queryWrappertm); - try { - list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid())); - }catch (Exception e){ + if(annualService.getannualthisid(list.get(i).getAnnualid())==null){ return Result.error("文件导入失败:第"+(i+1)+"行年度不存在"); + }else{ + list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid())); } - try { for (int l = 0 ; l < listtm.size() ; l++){ SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());