From bdfc82c77454f7b20b837f22eda57224806d44a0 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 21:32:26 +0800 Subject: [PATCH 1/3] =?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 | 15 +++++++++++++++ 1 file changed, 15 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 06967da0..7bcc2424 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 @@ -494,6 +494,21 @@ public class AwardPersionController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), AwardPersion.class, params); List listsave = new ArrayList<>(); for(int i = 0 ; i < list.size() ; i++){ + if(list.get(i).getAnnualid()==null||list.get(i).getAnnualid().equals("")){ + return Result.error("文件导入失败:第"+(i+1)+"行年度为空"); + } + if(list.get(i).getAnnalComp()==null||list.get(i).getAnnalComp().equals("")){ + return Result.error("文件导入失败:第"+(i+1)+"行年度比赛为空"); + } + if(list.get(i).getAnnualCompP()==null||list.get(i).getAnnualCompP().equals("")){ + return Result.error("文件导入失败:第"+(i+1)+"行年度比赛项目为空"); + } + if(list.get(i).getEnrollCode()==null||list.get(i).getEnrollCode().equals("")){ + return Result.error("文件导入失败:第"+(i+1)+"行报名编号为空"); + } + if(list.get(i).getAwardname()==null||list.get(i).getAwardname().equals("")){ + return Result.error("文件导入失败:第"+(i+1)+"行奖项名称为空"); + } AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration(); QueryWrapper queryWrappera = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, request.getParameterMap()); queryWrappera.eq("annual_compid",list.get(i).getAnnualCompP()); From f93e947e757dce9c37ae0f7b0e13b240474d7228 Mon Sep 17 00:00:00 2001 From: significative <163999932+significative@users.noreply.github.com> Date: Tue, 30 Jul 2024 21:51:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A6=81=E7=94=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/awardpersion/components/AwardPersionModal.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue b/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue index 9f07f102..7380cc03 100644 --- a/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue +++ b/jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue @@ -23,6 +23,7 @@ visible.value = true; nextTick(() => { registerForm.value.add(); + registerForm.value.setIsT(false); }); } From d4953de233d3027f705a0e438fd12d45d0c595e3 Mon Sep 17 00:00:00 2001 From: fhv Date: Tue, 30 Jul 2024 21:56:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E3=80=81=E8=83=BD=E5=8A=9B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonalAbilityEvaluationCollectController.java | 8 +++++++- .../controller/PersonalCompTotalScoreController.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java index 92023f49..03aa9923 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java @@ -13,6 +13,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect; import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,6 +37,9 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController< @Autowired private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationCollectService; + @Autowired + private ISysUserService iSysUserService; + /** * 分页列表查询 * @@ -76,7 +81,8 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController< HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(personalAbilityEvaluationCollect, req.getParameterMap()); LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq("work_on",user.getUsername()); + SysUser user1 = iSysUserService.getById(user.getId()); + queryWrapper.eq("work_on",user1.getWorkNo()); Page page = new Page(pageNo, pageSize); IPage pageList = personalAbilityEvaluationCollectService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java index 8c34e5ff..5b142d59 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java @@ -15,6 +15,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore; import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -37,6 +39,9 @@ public class PersonalCompTotalScoreController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(personalCompTotalScore, req.getParameterMap()); LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq("work_on",user.getUsername()); + SysUser user1 = iSysUserService.getById(user.getId()); + queryWrapper.eq("work_on",user1.getWorkNo()); Page page = new Page(pageNo, pageSize); IPage pageList = personalCompTotalScoreService.page(page, queryWrapper); return Result.OK(pageList);