From f3dd52274912bc0e6953864d6007b7a4576e5f85 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 31 Oct 2024 02:14:51 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B410=E6=9C=8831=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B8=85=E6=B4=97=E7=85=A7=E7=89=87=E4=BC=9A=E9=80=A0?= =?UTF-8?q?=E6=88=90=E6=B8=85=E6=B4=972023=E5=B9=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TGkPicinfoController.java | 78 +++++++++++-------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java index 29ec200..f1dc29b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tGkPicinfo/controller/TGkPicinfoController.java @@ -207,20 +207,28 @@ public class TGkPicinfoController extends JeecgController freshmanList = tFreshmanService.query().list(); - Map freshmanMap = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a)); - Map freshmanMap2 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getKsh()),(a) -> a, (a,b) -> a)); - Map freshmanMap3 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getXh()),(a) -> a, (a,b) -> a)); + QueryWrapper tfqw = new QueryWrapper<>(); + tfqw.lambda().eq(TFreshman::getNj, year); + List freshmanList = tFreshmanService.list(tfqw); + Map freshmanMap = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a)); + Map freshmanMap2 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getKsh() + "-" + x.getNj()),(a) -> a, (a,b) -> a)); + Map freshmanMap3 = freshmanList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getXh() + "-" + x.getNj()),(a) -> a, (a,b) -> a)); //高考信息 - List gkPicinfoList = tGkPicinfoService.query().list(); - Map gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a)); + QueryWrapper tgqw = new QueryWrapper<>(); + tgqw.lambda().eq(TGkPicinfo::getNj, year); + List gkPicinfoList = tGkPicinfoService.list(tgqw); + Map gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a)); //身份证信息 - List sfzPicinfoList = tSfzPicinfoService.query().list(); - Map sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a)); + QueryWrapper tsqw = new QueryWrapper<>(); + tsqw.lambda().eq(TSfzPicinfo::getNj, year); + List sfzPicinfoList = tSfzPicinfoService.list(tsqw); + Map sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a)); //学籍信息 - List xjPicinfoList = tXjPicinfoService.query().list(); - Map xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh()),(a) -> a, (a,b) -> a)); + QueryWrapper txqw = new QueryWrapper<>(); + txqw.lambda().eq(TXjPicinfo::getNj, year); + List xjPicinfoList = tXjPicinfoService.list(txqw); + Map xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap((x) -> StringUtils.upperCase(x.getSfzh() + "-" + x.getNj()),(a) -> a, (a,b) -> a)); //获取文件列表（身份证列表） //[/opt/upFiles/2023/东北师大/] @@ -244,12 +252,12 @@ public class TGkPicinfoController extends JeecgController { TFreshman freshman = null; - if(freshmanMap.containsKey(k)){ - freshman = freshmanMap.get(k); - } else if(freshmanMap2.containsKey(k)){ - freshman = freshmanMap2.get(k); - } else if(freshmanMap3.containsKey(k)){ - freshman = freshmanMap3.get(k); + if(freshmanMap.containsKey(k + "-" + year)){ + freshman = freshmanMap.get(k + "-" + year); + } else if(freshmanMap2.containsKey(k + "-" + year)){ + freshman = freshmanMap2.get(k + "-" + year); + } else if(freshmanMap3.containsKey(k + "-" + year)){ + freshman = freshmanMap3.get(k + "-" + year); } if(freshman != null){ //TFreshman freshman = freshmanMap.get(k); @@ -265,8 +273,8 @@ public class TGkPicinfoController extends JeecgController { TFreshman freshman = null; - if(freshmanMap.containsKey(k)){ - freshman = freshmanMap.get(k); - } else if(freshmanMap2.containsKey(k)){ - freshman = freshmanMap2.get(k); - } else if(freshmanMap3.containsKey(k)){ - freshman = freshmanMap3.get(k); + if(freshmanMap.containsKey(k + "-" + year)){ + freshman = freshmanMap.get(k + "-" + year); + } else if(freshmanMap2.containsKey(k + "-" + year)){ + freshman = freshmanMap2.get(k + "-" + year); + } else if(freshmanMap3.containsKey(k + "-" + year)){ + freshman = freshmanMap3.get(k + "-" + year); } if(freshman != null){ //TFreshman freshman = freshmanMap.get(k); @@ -305,8 +314,8 @@ public class TGkPicinfoController extends JeecgController { TFreshman freshman = null; - if(freshmanMap.containsKey(k)){ - freshman = freshmanMap.get(k); - } else if(freshmanMap2.containsKey(k)){ - freshman = freshmanMap2.get(k); - } else if(freshmanMap3.containsKey(k)){ - freshman = freshmanMap3.get(k); + if(freshmanMap.containsKey(k + "-" + year)){ + freshman = freshmanMap.get(k + "-" + year); + } else if(freshmanMap2.containsKey(k + "-" + year)){ + freshman = freshmanMap2.get(k + "-" + year); + } else if(freshmanMap3.containsKey(k + "-" + year)){ + freshman = freshmanMap3.get(k + "-" + year); } if(freshman != null){ //TFreshman freshman = freshmanMap.get(k); @@ -345,8 +354,8 @@ public class TGkPicinfoController extends JeecgController