From bf322250c528487c51e51e7ca1da666647c6c7ec Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Sat, 2 Nov 2024 04:08:10 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B411=E6=9C=882=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=BA=AB=E4=BB=BD=E6=A0=B8=E9=AA=8C=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E4=BF=9D=E5=AD=98=E7=9A=84=E7=BB=93=E6=9E=9C1?= =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TCompareInfoController.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java index 16b69e0..56d1442 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java @@ -287,7 +287,8 @@ public class TCompareInfoController extends JeecgController calcAllFaceData(@RequestParam(name="year",required=true) String year, - @RequestParam(name="type",defaultValue="all") String type + @RequestParam(name="type",defaultValue="all") String type, + @RequestParam(name="sfzh",required=false) String caclSfzh //@RequestParam(name="fillUrl",required=true) String fillUrl ) { log.info("开始批量对比!"); @@ -321,23 +322,23 @@ public class TCompareInfoController extends JeecgController freshmanList = tFreshmanService.lambdaQuery().eq(TFreshman::getNj,year).list(); + List freshmanList = tFreshmanService.lambdaQuery().eq(TFreshman::getNj,year).eq(StringUtils.isNotBlank(caclSfzh), TFreshman::getSfzh, caclSfzh).list(); Map freshmanMap = freshmanList.stream().collect(Collectors.toMap(TFreshman::getSfzh,(a) -> a, (a,b) -> a)); faceMain.runFlag(); - faceMain.addRunSize(allNum,freshmanMap.keySet().size()); + faceMain.addRunSize(allNum,freshmanMap.size()); //高考信息 - List gkPicinfoList = tGkPicinfoService.lambdaQuery().eq(TGkPicinfo::getNj, year).list(); + List gkPicinfoList = tGkPicinfoService.lambdaQuery().eq(TGkPicinfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TGkPicinfo::getSfzh, caclSfzh).list(); Map gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap(TGkPicinfo::getSfzh,(a) -> a, (a,b) -> a)); faceMain.runFlag(); //身份证信息 - List sfzPicinfoList = tSfzPicinfoService.lambdaQuery().eq(TSfzPicinfo::getNj, year).list(); + List sfzPicinfoList = tSfzPicinfoService.lambdaQuery().eq(TSfzPicinfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TSfzPicinfo::getSfzh, caclSfzh).list(); Map sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap(TSfzPicinfo::getSfzh,(a) -> a, (a,b) -> a)); faceMain.runFlag(); //学籍信息 - List xjPicinfoList = tXjPicinfoService.lambdaQuery().eq(TXjPicinfo::getNj, year).list(); + List xjPicinfoList = tXjPicinfoService.lambdaQuery().eq(TXjPicinfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TXjPicinfo::getSfzh, caclSfzh).list(); Map xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap(TXjPicinfo::getSfzh,(a) -> a, (a,b) -> a)); faceMain.runFlag(); - List compareInfoList = tCompareInfoService.lambdaQuery().eq(TCompareInfo::getNj, year).list(); + List compareInfoList = tCompareInfoService.lambdaQuery().eq(TCompareInfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TCompareInfo::getSfzh, caclSfzh).list(); Map compareInfoMap = compareInfoList.stream().collect(Collectors.toMap(TCompareInfo::getSfzh,(a) -> a, (a,b) -> a)); faceMain.runFlag(); @@ -352,7 +353,7 @@ public class TCompareInfoController extends JeecgController