From 981af2eb47810390f39ed93c344529140a1de632 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Sun, 7 Apr 2024 08:37:28 +0800 Subject: [PATCH] update --- .../modules/art/dto/RecommendMajorDTO.java | 6 + .../modules/art/vo/QueryRecommendMajorVO.java | 19 +- .../mini/controller/MiniMajorController.java | 43 +---- .../jeecg/modules/mini/dto/MiniSchoolDTO.java | 11 ++ .../yx/controller/YxOrderController.java | 12 +- .../YxSchoolExamMajorController.java | 178 ++++++++++++++++++ .../modules/yx/entity/YxCalculationMajor.java | 7 + .../modules/yx/entity/YxSchoolExamMajor.java | 75 ++++++++ .../modules/yx/entity/YxSchoolMajor.java | 7 + .../yx/mapper/YxSchoolExamMajorMapper.java | 17 ++ .../mapper/xml/YxCalculationMajorMapper.xml | 10 +- .../yx/mapper/xml/YxSchoolExamMajorMapper.xml | 5 + .../yx/mapper/xml/YxSchoolMajorMapper.xml | 4 +- .../yx/service/IYxSchoolExamMajorService.java | 14 ++ .../impl/YxCalculationMajorServiceImpl.java | 1 + .../yx/service/impl/YxMajorServiceImpl.java | 6 +- .../impl/YxSchoolExamMajorServiceImpl.java | 19 ++ .../yx/service/impl/YxSchoolServiceImpl.java | 11 +- 18 files changed, 376 insertions(+), 69 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolExamMajorController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolExamMajor.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolExamMajorMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolExamMajorMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolExamMajorService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolExamMajorServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java index 3201e79..9ecd0da 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java @@ -129,4 +129,10 @@ public class RecommendMajorDTO implements Serializable { private String schoolId; @ApiModelProperty(value = "标签") private Set tagsList; + + /** + * 考试类型(统考/校考) + */ + @ApiModelProperty(value = "考试类型(统考/校考)") + private String kslx; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java index 01ba003..62a7115 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java @@ -66,22 +66,9 @@ public class QueryRecommendMajorVO extends ArtBaseDTO { @ApiModelProperty(value = "录取方式List") private List rulesEnrollProbabilityList; - @ApiModelProperty(value = "成绩id") private String scoreId; - /*public void setBatch(String batch) { - if (StringUtils.isNotBlank(batch)) { - if ("本科".equals(batch)) { - this.batchList = Arrays.asList("本科","高职高专"); - }else if("高职高专".equals(batch)){ - this.batchList = Collections.singletonList("高职高专"); - }else if("本科A段".equals(batch)){ - this.batchList = Arrays.asList("本科提前批","本科A段","本科B段","高职高专"); - }else if("本科B段".equals(batch)){ - this.batchList = Arrays.asList("本科B段","高职高专"); - }else{ - this.batchList = null; - } - } - }*/ + + @ApiModelProperty(value = "考试类型") + private String kslx; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java index 5f471a4..c1e17c2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java @@ -12,13 +12,12 @@ import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; import org.jeecg.modules.art.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxMajor; +import org.jeecg.modules.yx.entity.YxSchoolExamMajor; import org.jeecg.modules.yx.entity.YxSchoolMajor; -import org.jeecg.modules.yx.service.IYxCalculationMajorService; -import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; -import org.jeecg.modules.yx.service.IYxMajorService; -import org.jeecg.modules.yx.service.IYxSchoolMajorService; +import org.jeecg.modules.yx.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,11 +37,9 @@ public class MiniMajorController { @Autowired private IYxMajorService yxMajorService; @Autowired - private IYxSchoolMajorService yxSchoolMajorService; - @Autowired private IYxCalculationMajorService yxCalculationMajorService; @Autowired - private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; + private IYxSchoolExamMajorService yxSchoolExamMajorService; @Autowired private RedisUtil redisUtil; @@ -77,37 +74,6 @@ public class MiniMajorController { @ApiOperation(value = "小程序端查专业列表") @GetMapping("/miniMajorList") public Result miniMajorList(QueryRecommendMajorVO queryRecommendMajorVO) { - /*LambdaQueryWrapper yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>(); - yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,"本科B段"); - yxHistoryMajorEnrollLambdaQueryWrapper.likeRight(YxHistoryMajorEnroll::getMajorCode,"3"); - *//*LambdaQueryWrapper yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); - yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getBatch,"本科B段"); - yxSchoolMajorLambdaQueryWrapper.likeRight(YxSchoolMajor::getMajorCode,"35");*//* - LambdaQueryWrapper yxMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); - yxMajorLambdaQueryWrapper.eq(YxMajor::getEducationalLevel,"1"); - yxMajorLambdaQueryWrapper.notLikeRight(YxMajor::getMajorCode,"35"); - List majorList = yxMajorService.list(yxMajorLambdaQueryWrapper); - Map yxMajorMap = majorList.stream().collect(Collectors.toMap(m -> m.getMajorName(), m -> m)); - -// List list = yxSchoolMajorService.list(yxSchoolMajorLambdaQueryWrapper); - String majroName = null; - YxMajor yxMajor=null; - int i = 0; - List list = yxHistoryMajorEnrollService.list(yxHistoryMajorEnrollLambdaQueryWrapper); - for (YxHistoryMajorEnroll yxSchoolMajor : list) { - majroName = yxSchoolMajor.getMajorName(); - i = majroName.indexOf("（"); - if (i!=-1) { - majroName= majroName.substring(0,i); - } - yxMajor = yxMajorMap.get(majroName); - if (yxMajor!=null) { - yxSchoolMajor.setMajorCode(yxMajor.getMajorCode()); - } - - System.out.println(majroName+":"+yxSchoolMajor.getMajorCode()); - } - yxHistoryMajorEnrollService.updateBatchById(list);*/ return Result.OK(yxMajorService.miniMajorList(queryRecommendMajorVO)); } @@ -151,4 +117,5 @@ public class MiniMajorController { } return Result.OK(dataList); } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java index 1b2dc7e..09cf537 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java @@ -201,4 +201,15 @@ public class MiniSchoolDTO implements Serializable { */ @ApiModelProperty(value = "学校科研教学") private YxSchoolResearchTeaching schoolResearchTeaching; + /** + * 考试类型(统考/校考) + */ + @ApiModelProperty(value = "考试类型(统考/校考)") + private String kslx="统考"; + + /** + * 录取人数年份 + */ + @ApiModelProperty(value = "录取人数年份") + private String luquYear="2023"; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java index ccfcefa..36c344b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java @@ -180,14 +180,14 @@ public class YxOrderController extends JeecgController return super.importExcel(request, response, YxOrder.class); } -/* public static void main(String[] args) { - List cardList = Arrays.asList("V137KEYX", "ENVGDGVV", "3KH0URFJ", "E8IVY2J4", "CETW84LQ", "3IRVN0LW", "NSHV50PB", "ZS171L2X", "F4FF9EU6", "F1AN6XEO", "3HV8YVWU", "ZDYQYFEN", "BLI57T71", "YPGY5PGF", "WXCDBP11", "2NEJL4D0", "QNEA8S5W", "5KD7CPMP", "I9RRVY4Q", "LQ1HX9XG", "BW9UTR7B", "31ZFVGN7", "4T1PHTDI", "DEN04RZ1", "R55KRRN4", "8PP3IO2X", "C0NG62VJ", "2OUJCM73", "CO7KZM35", "GUZTXUN3", "SIK3QJ1Z", "0D1ZQE9C", "ETRWPV6Q", "X5DZPMYQ", "DAL0PSRU", "7T228JLD", "J6FN2HVS", "GDZ5ODBI", "I61PEEO8", "UGMG2IC3", "CBGT6EBL", "KDU3DUL1", "57UKTQQC", "U39XHZJK", "ETVZEKVC", "1O667OZM", "0TUFMUFW", "XSJV9REF", "YQIJV0HR", "OY5NW48O", "HLRNNTZL", "M4Z7Z7FQ", "U8RANPNW", "N2THU1V0", "RPLES2E0", "UGDCNQFW", "1KH601Z3", "TKOIR485", "387IG462", "ECTCERRN", "0TEO5QQW", "PJ7Q62WK", "4CRNV0VE", "FMBW53Y6", "FD4GHMRT", "YU70LXZ2", "07KFCOSS", "EGN1TG53", "QB9LWJCN", "I2OF1V7F", "S8ZJKYK6", "7N9T1TH6", "HBIQH6EX", "4565IGIU", "06HOZ650", "6KQ2ZG0D", "9R5E3SZV", "EDITL0RN", "JG2RRHFK", "UWVG9NIR", "14J4W41U", "9F7DZCIO", "8QDPGIYG", "5QJUTQ32", "WI0TAECP", "OFT51TPB", "RHWWUDVH", "2TQL3UCD", "QJ4PLAET", "ETEGDH4T", "POFU2A02", "GKP0M0PP", "RV8HLXB2", "YY4BWESH", "SHTXM4W9", "UI34OP1P", "LK6T89IY", "SPL4QSMJ", "974RV6WU", "OG5MOSFX", "8TL14WMW", "LF3ONGOR", "GDCAT0AD", "PNGP5LRH", "MZSMXFJA", "NPGYCD61", "WIF5W5PD", "HKOQRWII", "2I64DWJC", "U7350IT2", "BR07F7WD", "SHNHWRBR", "CJ7FN02O", "YM3VFSKN", "XSWBY7JM", "5PJ8JGGU", "9SQKMJ5A", "109DCN86", "QOEX046L", "QIFD8BTF", "BC258TVO", "TBYPUIOH", "NFTIX0VL", "KSKE6ZEQ", "YK98P15R", "F3RS20NL", "ZS4Z0TRZ", "IOT0MZD2", "E67MQSRZ", "8LD4YT1N", "O1GVF0J1", "WNSWQYYC", "DVREYPFN", "YLZUXYYK", "S22SCROP", "FT2DJ538", "092FKSV7", "BK425PZX", "4LODEM02", "LQXL1VIR", "PVJUQR7M", "0J385VQQ", "J0GGKGO1", "K68KIU3M", "CKZWBB2Z", "B2ELWG4L", "HWR23BO5", "K6D8FL79", "LPJW2W14", "C454ATPR", "CMIYKMB7", "TGLDDIKQ", "U48NKD6B", "VOW5CV0O", "71PDNNLB", "M6FQBMVO", "RXXK1YT2", "44YXDXAH", "98QOYCDL", "GMVZMQH4", "O8OSQYJS", "Y5CAWTPL", "BDPGSOPM", "4YZUQ7P7", "4PRMLF0O", "LCWVI2GA", "NM1CLBTQ", "FNQKFCEC", "WOJIXWBA", "FH2VDVDM", "7SWQKH2S", "7SX5H3XJ", "LI00HT7S", "EU2L3R8N", "78AOTO8L", "BI9S19LW", "K9TYU2J4", "XICCZF54", "L7RWRQED", "LO6KUTK2", "ZTAJ3YEC", "F50KUMTY", "OJ9RPQOO", "JTERUQ8A", "UDR1GSDH", "N2S8S34Y", "N08YXYFM", "860FTXY4", "WVHVJI72", "HREC0DS7", "WLKIINCR", "YZSA7YZR", "IFYXHMKY", "JPDMQXH6", "B4WJFX2Q", "Y1NROG7B", "VZLSF5P6", "XOZND8YJ", "QXKSEVDC", "K7CU6UUH", "XRKGFRCT", "ANYALOCH", "1BSAK6LQ", "E6DHPPTU", "MVVKPWRN", "XTZ05X01", "E9TOXNX7", "YFVNVHPF", "RWGZTODM", "HIA244RT", "6VETGJIB", "P7IWF1MJ", "2MQ2V7RF", "Z4D7CS8V", "TT7Z14PO", "J6WQ0TED", "K8V0QKZN", "IP0XVTDU", "CWSQXI6B", "X1F2NGFS", "6U8E7GM0", "TG59GKWL", "YYUSHN7C", "24NHY143", "FYB5JUL4", "OLJIV143", "PB6L8KC0", "EZT8NXA3", "782GDMQN", "PLDXZAC3", "ZREXPN52", "FW3BWKRP", "CCK4H533", "VDLOFCFU", "23R3ZF8Q", "UZPH1KIN", "UHZRUWF6", "IKZKWK8R", "1AEVBUN5", "GB38A3X3", "5XHDQ4YL", "P6EBFCKG", "DI6TNHKL", "8BKRCXKI", "GWU34P8Y", "IBLI55YS", "CZGMK29E", "V41LB4GW", "F51ZMQFL", "T3AB6XF7", "WJO30K3X", "RFTUBTNG", "ZWGQKB4E", "FLF406PF", "UH76R3WC", "NVXM4WSI", "REBIFYXH", "KC9IV5UO", "W4REOQHP", "K8M0INZ6", "GUE8NSPB", "O17XTERO", "S4SB6V0S", "4LEYQ3V0", "E09USVM5", "FXC7PZLC", "ZILSUTP8", "DXRIEHQC", "1TXDTVVG", "J9OCEDSX", "WQUX1GES", "M0PNRVWU", "JHURB4GK", "XIY6AM32", "BVU23CKU", "1ZS5KF2T", "HNRJRHJE", "2006POFJ", "Q98HZZU4", "RKHFRJJX", "TJ6IM8DY", "T4FKEHPK", "0MDG7YZU", "GFVGQ5CL", "NS8078JJ", "G5CX4QCH", "6RXBUQV8", "V40WDC5C", "8O3XGBDR", "5JXBLT20", "9M4G5U2P", "EQ0I74DX", "NLW4ED1I", "OR2T1DV8", "E50WYO7R", "HCYCSNKE", "NO0BFS9M", "4EMJNVDF", "3LJDBLG6", "F5A8XLPS", "NDQMDZ7Y", "XDF3YCHI", "YDO5IT16", "Q9HW4659", "3FQG5JSP", "VVG9SEEU", "VJT1EE22", "KZOSXNSP", "TROE2EQJ", "GW7K1V57", "WXZ3QN0E", "8VPQE1PU", "SODSL03V", "Z08D3HY4", "57FMFOUD", "2SEQ1WK5", "TXTRY8XJ", "FN6RZ7XH", "G7W5D17F", "PIBG21WL", "079VZHEW", "PONHQCIM", "6JZMCB2A", "RW24PVRU", "LSTOM5AZ", "I3XEJ73S", "T01SXGYS", "CGDH0R0Y", "QMD3X31V", "608YQEW7", "LETUBHMW", "8PR0KC8N", "0UJ2E6E9", "7LY2HH8P", "S5Q88YZB", "LBIFMJG2", "XO7LCCZ7", "DZC3F0K0", "1NX6B0GV", "77XE6S7R", "SKZH0CNH", "C6M7LJJ7", "EFNG7GBE", "XJNHCVN2", "0ZG0DZIL", "K3GZDUJV", "3YPHFFU0", "FCWQUUZ3", "FFDU3RRM", "AEZ5LCHN", "G4IP32SF", "IN8KC7Z5", "WS9SYM5Q", "R5KTSIMY", "M22ZGP1O", "01UO45WN", "EXQ1BOEG", "DGMS1Y8R", "QR88P75J", "KVB2RBP3", "REWZWXOR", "3VYEP1E3", "W7ZUIGDO", "XUH6PDCJ", "JDCRW36D", "2MVKLJFT", "I2ONBQZB", "IH8C7375", "MWAD4B5Y", "GT3ZRGHD", "Y2DGI3W3", "PEYLM7RR", "EFRFYTJN", "ZFXN9CO2", "WXDOUXGJ", "1NWGOGDZ", "Z5CXM32P", "06O4Z4TH", "TYYEOY33", "8YNB2BIN", "KR0371WM", "KNFR5GIF", "NPJULDBU", "FFEDFWVT", "CNRJ50RS", "VJ7NSG5V", "FGMLX6GS", "XHEOS8JX", "DF5UUXFW", "U38KRLZ6", "XJTSSDR7", "LWIZ3X0P", "IM1V53SZ", "2QQY71QT", "Z53PVFXZ", "UNTZMWCF", "GEXCV8D8", "S0CCH0MS", "F9U7E14D", "WYB3W1IN", "UYMN4RMU", "GNPWFV9W", "EFV6VV0Q", "75XO5PAL", "U2QSFPJ1", "FPTR50GU", "SNN7XW8M", "YG08C4G9", "HOY1LDT3", "DBLYMV3J", "KQYRGS3T", "0QS35VCI", "MXXKVNSJ", "V1CEVG54", "TP88WP2I", "0OJFL8IA", "YUI5QLEB", "APUAD5ZH", "WCQFY1RX", "932I4SCN", "5A5LL31O", "YLK7FP5F", "2KNP6LU6", "VQQUWO6Y", "0A7GR4RD", "SP2JTDTP", "TUIWTCOZ", "IDWT4BWU", "2CFXTL41", "VORCCVJ5", "0GHCL46V", "8YBIV7O8", "IIUANLI5", "VIGOETF3", "3LS6HVDL", "SWGP8S0A", "Q2FVQAE7", "UFGG6YT0", "Q2KI6WS8", "J0QUM9PA", "83Z6XN10", "X1QHIJGU", "VUA3PSHC", "09XKUDBQ", "6TDFIWQ7", "RTQ2ODF5", "2DMY0VMP", "HQDWJM8U", "2Z8YD78W", "S182IN1X", "MHYN9XJN", "72NJ2K72", "VQFZDZ7I", "Q5KBYJLH", "I4DH1S8Z", "FJ7XB31W", "PL2CW3XK", "U10I9MQU", "PNKUMEG2", "UDF2WZQC", "002OBWL4", "YK41UXPE", "RAPXFX5B", "QNTFN5H8", "67IRPO87", "IYNWSSVE", "MKS8NB44", "Y3UB5ZF4", "YDNIDF03", "38QCY1XT", "NAQVUULL", "SPI3DS5W", "JBTIYAEX", "QG6KI2E3", "FUA23ERX", "NFQV0ZJQ", "SQZCQRND", "Y67RXO53", "1N5MGVPZ", "ZGGLTJH2", "TWZXMPAX", "GH79XNWQ", "KAHVBTFK", "1QW2UO8W", "6R7X20C3", "BENDP4G4", "3TD96OYH", "CKUBPQ0S", "DKAB3DKR", "VNULZGGD", "1P1ILG5Z", "OKYMDVTG", "8F0YVM31", "2JSMAWKU", "XL31Q287", "2S4N3F5O", "O5LOYDMD", "3111MIED", "MMICS82F", "QYUUMABY", "NVETLO5F", "ZT32EH3R", "HTISHYA7", "I0B3IW7Q", "WM8CBY35", "7V9EW5YO", "EXLWU2WE", "O209R5TN", "VWZZHMJL", "BHG68BML", "19K60BTP", "HEDLMUWS", "W1NDVRUU", "KSEKEQBM", "KASHZ44M", "Z5H0YD2Y", "IB5XYN5E", "40REYH7C", "PKOJSXYR", "JZ4UFMH6", "RNT97RRI", "3JH5G3GN", "FGUPRXYU", "WL17KG4R", "GJJ40DJY", "W1N3TXBE", "Y5CARWIX", "LFBMHBGJ", "R0H8E1DI", "LNVX7TUB", "003KI416", "AMS8Q0XF", "X39CV4NG", "3PLKMP61", "PXQEYVX1", "JZSMKMDH", "BUSGQM69", "W00FMMWV", "6NRSPQFU", "EYOXDL6Q", "B9J43SNK", "YDBXR5SS", "5BRY0OFD", "12SM1ARR", "SEQSVUK1", "QA1D8N98", "9UR4HPT4", "0IF6Z2T3", "VWCGAVQG", "Q7HGF4ZV", "A75F1I4F", "ZKF029B5", "SP42LP4L", "3HIUMWDL", "SRK4PORE", "1XPO9YNW", "0QLJUWVT", "WXE4IC8B", "K1MWDILK", "7BHZCXZ0", "OF6O8FGY", "2FXC7M96", "N9JJW2PL", "IDOAICUD", "68QDZ7NJ", "HQLMB0Z7", "ELYN86SR", "OSFKHMRL", "N1VFU1PU", "DW4P448Y", "PROV834C", "KR8BFA3C", "TBTF3IHA", "B68XTA5O", "C3NF740J", "G0ELU5VE", "EFTZLM0K", "T9DD47MK", "XUG30DY1", "WNUS12JW", "0Q4USQ5H", "77B7MSY5", "OFRPUUEJ", "H0O3F8CT", "I8KYWIRR", "IWH1DUFW", "KEHMH4KN", "5V2YBEU5", "UTYOU1M1", "N04BOQ8S", "48M19EWB", "XA4VBLSP", "FREOFLKY", "JFL6CEPL", "7SDS8AJV", "TIJUD4SD", "2BWBO7UC", "3ZNFRRM0", "58S9N1HT", "5D07XU38", "PKYFV16V", "EUX7ZUTC", "IO4YXHE7", "73TDDSM3", "5NFB4VUB", "CNMPVLTN", "3LR8Z24V", "R2HEC4U5", "SUJIJLFL", "MJTGYJ0E", "0ZEN9I3V", "4C36CFJB", "2D9WF36H", "BV2U3BLX", "DD98ZRJH", "Y6BD561R", "V78WOZZ0", "IP7WPSMQ", "S69R8TPT", "JU2RQ75D", "BPPQHFC8", "GNSBPGW0", "NJEO3K0E", "PIKIQBVS", "3DIXZMWD", "3QMK3TS2", "9XR04RMR", "UIWS2TZ3", "8Y2T08TS", "WQ4JOBU4", "TNRIP2TJ", "WFEINS07", "F6GTLWWF", "NM43VMIE", "2C8SABV2", "DCTRFRNM", "7SKPFDBB", "2HIDBRJ3", "TQXENIQ0", "K3NOQJIX", "LP708QR1", "T7U9BVJA", "J60RJWFU", "QW03RB98", "1G6MXVAI", "40J0548P", "H7ZL61PP", "3IHFP576", "SP5ML7DU", "8CUVVQ3C", "YLO18IMV", "ZJ0P0R15", "SU266U92", "3QGTIBTM", "8EO716ZT", "ZWITMXB5", "N6C2UEZ1", "DZADDFZN", "HGMWW4MU", "1XWVI6WK", "OBO8S2VL", "G5H94OT0", "DTYQXCOU", "LQUPIITC", "DJGQ3GJM", "XK1SDC3S", "DPNLBOSN", "E4KWZ1EY", "QXWCAM0E", "FY9ET5XF", "IN6D3Z1Q", "E5JOQCKK", "K8L224WN", "MJ6IH625", "4X34FBHY", "NE272MUW", "0MJ0DCQ5", "I5P8V7XY", "2U8O4ZK6", "Q2X76MXL", "35Z40N8L", "72EC1OST", "DRLG6WTF", "YZ3T87Q6", "VJOZTPVL", "QLB8MTK6", "274XLF5N", "8G6LVPYB", "YGYTCHZY", "P0UF62AK", "BG58V6JV", "Y0SGBZ4Z", "7L72IGS0", "OX0STDQY", "XNTA4HUM", "S99R3BMU", "OHSCE2FG", "OPF5J4L6", "SUZ2C6Y1", "F6UMKZGM", "E04LSPOO", "Y0WTBRG7", "V4YUUEZB", "YV5ORVVZ", "53VF5RGQ", "ONLB02KZ", "U0E3GLPR", "I8JJCWNM", "NH2NQ6US", "JL6NB2D9", "YBJYY115", "C4VBRQ3D", "Y082NUF3", "A4FMMHEF", "UNE2ZHK7", "4EIGK3C4", "12QKLH8L", "QUFUJ1QI", "YCRXIO78", "W3OOY5YD", "BNB423UL", "WUVVYO11", "JZ311CFN", "JJIWY12J", "TZILU4IR", "RLPV655E", "5PIN5D5Q", "LIM0UJMM", "854EXU43", "U137RMSI", "LI1CQOF7", "7SP4OI62", "59ZFEVU3", "N9L69F54", "IIHHPD1N", "LNFUD4OZ", "VWFAVHGY", "MP6BHK7M", "TVIRNT6O", "4IF8PQBH", "MFYSJE3L", "B6BK7PEK", "PSTHLTR0", "VTUFCZIB", "KABK8M3X", "GNO1NZGE", "76LY4K8N", "KYD62HPW", "NRWLUEHQ", "8DLF03L6", "INZBSB1L", "LVDL7LJA", "18WHOSVJ", "4DBGQ732", "0TL1USZ4", "5L5KZMV6", "S4QBJMEC", "WYAJN0KZ", "L0IV6JC6", "UA2BXJ9L", "JJUCU2KQ", "PKGJNYOF", "UO94L1Q7", "6YTOQIVL", "YCND37BF", "CLIGHD7A", "RLI3KWQQ", "W8YJ1QRL", "E3WI22XH", "DVTIVRXB", "2AX4Z0T5", "VRY2P3LW", "WUYFUKMN", "HQ83Y5A2", "STYAZTWL", "E8V3Q7VA", "G0MA5DQ2", "R5D4SE6T", "PBNZICGV", "D6EJF7BW", "LYBNUGIO", "XPXYZ5P3", "HWGCFHPH", "SFPNYO7H", "ZBBZ4H7P", "15JWA08Z", "0HXR1OR4", "MI1DRV1L", "D6WLGQ8E", "QL0V5ILX", "QE7FR07G", "YDVY8C82", "QRVLLTGD", "GW7316ZE", "ZC3BIFQN", "W557F6CC", "2BDCOMBX", "LW57FP4N", "KMYPRXI9", "EXWIT5KL", "01P0XIVD", "OU88KDVW", "ML2Y8RIE", "BMH6B2W4", "NG1VTG08", "VP76MEV2", "B17ZZICN", "OHBJVTPB", "ATRG4H6F", "2LOUIUFX", "6GIHM7TH", "2SRAV12H", "85HOTUMC", "DEWP9X6W", "WMRR65J4", "RMS5L4C7", "9TUS5490", "75WWHCRM", "71Q82OKS", "JI06PFVN", "BBVKOZX1", "NH1JRU2S", "1Y0GVM87", "MIONBZC2", "NG4031VC", "U4ZWIWJD", "05MZDMJX", "SMPVYD0O", "4KT1XJCM", "30WWTZVY", "EIQ72PCM", "K4R0QR04", "PIK67JNO", "66CJUKFK", "4T5NKEDI", "14AG27E1", "US3X1BTD", "NU0YGSDR", "SIV7WYP2", "IU55YDX8", "NG4ZD0QY", "PRBNFZ4D", "T0FY936M", "ET73ZXTI", "UFRB99LH", "PQLTLSSV", "ZSLVQRV7", "X25DWGW4", "YNC6FRSX", "DDYG0LK6", "569RV286", "XI56EURC", "1MRW1YUS", "EZQEIP8L", "TIMU46M3", "7KNH7TBZ", "NNTXOFWV", "440TQ1XP", "EH78BRKT", "KU0DKHSN", "HLYJAYAY", "Z4E3LOK3", "ZZZU2WDF", "DSH41MMM", "OL6YSLZ0", "5RRO8W8F", "USM5BGLS", "GN7RGGNO", "47LVJ9EQ", "P2FG05IC", "V3VUT219", "8GCSNW1Q", "NHX0Z1X8", "TTANXDM1", "D4E69UF2", "8GI3UGKL", "7ZOIPOQ6", "VRDHBRN2", "BUWWRKRR", "SJOQYO2J", "XW5WRJ3C", "IV7XVD0F", "1O2UWIL1", "B1JD78YP", "TGE3GQD4", "BBGYUCU9", "Y234EWGX", "3PRJH85A", "GQ1KSYU7", "BJLJQUS3", "7ZUJ2J5G", "11E176HP", "7NSKTKHC", "YL8NP3GW", "2QGRLLGI", "21JZO0YY", "6P4CCS7J", "X4N3FRIU", "Z9AAFX39", "BP41X5C7", "LNVGCEZO", "8KJJPHXO", "R4QEMFZI", "7WC9UZPM", "JVW7KNWZ", "BCAICT53", "BOLGIJ7U", "BTUWX2Y3", "QYVMIRK8", "1U6BFFWM", "JD624T27", "GNWO37XU", "8GQTCZJA", "15BYVCRG", "6NX2BJT3", "EQT8SULQ", "7UE9B6DJ", "QDTR2KP8", "8Y4M8D0R", "P3R5C6YE", "U4DIF432", "3QDTQKX6", "OUZYKUPD", "IO8F0PGU", "PXY215OJ", "06EL0YE7", "4AP1Z3D4", "XVB0KU1H", "D15RTMPU", "UHPBEHAP", "4I4VFT2L", "5983YNXW", "S06XPNJ3", "AMRWYVGP", "EXI8C2GL", "QVQXFZYM", "FTSAUK38", "P57ADIIF", "A6T0DVT7", "H5WUU74N", "9RSFCPOC", "AR8TWJPK", "GUJ5XHT1", "VDJOEKSB", "3DWR4G9G", "MX8K33EH", "BDRN02YF", "TYNMWFRE", "0LZTYT6R", "ATWY431T", "74TA8GOU", "TK6I80YI", "S1OZ0JP5", "5ECF473Q", "TBDKOIG3", "HY7M0I6L", "PO8AS0Z2", "ST8UO0KW", "64E8HTZH", "BIKX60PO", "4CLBPYZ8", "96A8NP0Z", "UT5TRU0H", "3GETUZIK", "ELEISKHR", "7E5WH14Z", "KPVIMTG1", "RXEMBUB2", "EYEBNO8K", "RCXUQNSU", "YELQFVQT", "DLHPJ2FC", "BJCVOK3T", "KE1XTPNO", "3R4FI18E", "DXRJ5BIM", "JZNBWO55", "RV0ZAIDI", "S0MPNG8O", "0FY4BFTG", "K012N7DO", "8KHMHRT6", "XHLBOWLQ", "HZ76Q6LL", "LQFU3MOE", "DREINJLK", "QWBW3467", "BE52CF52", "WD4G8YBM", "TY2ULZJS", "ARYTMGCI", "UDVJEI5I", "405PIQKO", "XXNTCE98", "WQLSPQ12", "7CU77Z2O", "JBR1DUWR", "1U5IUBZO", "Y8ON6VCR", "4S3Y44G2"); - int i = 10151; + public static void main(String[] args) { + List cardList = Arrays.asList("S282STSH","7WDWR8QW","F6JXMZFN","94URRCPR","QY4JLYNP","DUJ6337Z","B6QPEECU","YTPYL7YU","Y3XS47QV","9WGEGE5N","FENPBNWW","MNKDYDSX","YPZJ6845","EXM6QK7U","KZC4KPCZ","TL23DX7Q","AW3GZS7R","587MCPB4","WMRWLNQD","HVDKPU6H","V7LBPHD5","NLT3F6ML","D9CT2QT2","EPNMPRHP","R7386TZE","TWBC8MBB","F987QE7R","8XEN7FPP","8R7PLG4D","6D9ZUJC2","4LPUSMRS","VMYEFSHZ","HQZDHUCE","56JGUX6N","P77E4E86","DDDSCQJU","RB9DL5VQ","7Z8E3SKY","4KX6USXS","Q2SMKY6Y","MH9YXWKG","94GNFJVH","E8FF6D7V","PR4U2BYZ","SLPUKZVY","63SHG3WE","ZWCDH965","TYGJFH2M","HBPC28FH","NPYUMCYB","SPBCQVN3","LC5RZ2CU","QX88XZRF","TF5K7C5C","HEYMEEZZ","NB7QW9SS","2TY4XHNM","PELJR2KJ","GJGTDCQ8","MKZ8WRP4","KDYTUNKV","5R7H9CUU","SMKKVFXK","5PUAN5FY","LE884C3X","GRDWKLHW","REEW5VSB","GNYCT2H8","RM44BBSR","7LZZC4FZ","WECWNMDS","ZJX35ELH","FUFMY3CR","9Q5YTVB8","HFPXG2TK","8RVY5YPD","56NDL5YR","VGTHDU3C","UJHYGLF2","VWYWVUGU","3W4C5W3M","GD5Y4MVH","VJZLTBY8","YQZFVYTJ","CZVMML97","282WVGU8","GZLZUS9K","MG8QSX3Z","EY5L68TF","GSLZR5N3","3EZDQYR6","HZNVP3BB","9HFBCUNL","KJMV7ZS3","J467NTQ2","JP5AG3S5","5VPN6TJX","WCB8J4CT","V347W46W","GYUZFJ6A","H3ACJWJ7","6RXDSQGD","PU8BUHZB","UZL37EHR","XXEKMD2L","AFJDCVVA","NJZDL8CY","QBTPDU7P","8UWQDLUL","X8NB5L6U","RPLKMEDN","HGXE6VP6","BQ76NRUP","B5DS55B7","B65V46Y5","WFLKL3ZU","4EY25FBG","UPRT5F7E","YAM6CDNN","P56M7FT5","9SUP6V7V","X3J5QHV5","RTHURQ8V","M9C9HP2C","C4FYYM8M","UGRQF4LL","XZH2SDRG","XPWMUQ2R","FX4E589H","STGD8PYG","8LMVCQEY","DFR52FBS","7JK582MY","U6HKXUFB","XYHSPLCE","RFQPZPYT","D54NM5T4","DXCH4RYK","DCB59E5M","XKB8P7RA","MPUS53A3","VK8GURCR","US3NNTVY","NZRLW4EH","CFYCJHSX","D24NDF2K","LN6V667Z","4Q5FJBZ7","MSJM5DKH","4X8X7DRT","6PHGPZUN","8AM3Y7ZX","645AENJA","KDFZSEM2","CGNCBQXN","3VVGJ3H2","QBZM89D9","NW9W8DDL","BQ46Z2KQ","AHKQZCCR","86AQVFKQ","GGDR2F6W","JCBKF8E4","AYM38E4C","6LQ8SP8H","6GRQ68GK","3PPGPH7P","MUFGP6HF","WFYJHG7S","2KRUSEQK","D2CLH4B8","JBH5FRK2","MRCGCHC2","FKUF5CCK","MUTP7CTG","5JQRZVKP","JZCME4L5","5DKJWDZC","2HH973BM","BVKS75T3","KJ4CHD4J","6MUDRJKY","XNTNLZJ7","D36PCPLQ","XK589N3V","BZ6WJ52W","UNCFF3B5","CRC8R8UM","NFG26DW7","DBMGPML6","JPMCRZ4X","CE3EZZBH","5X5VPBTF","4QFKTGRZ","59FBBYSX","44FBJ2VU","VFBQKKUM","5DVKAW9H","SMKQEYCB","S337ZE2S","M2GD67VU","DLRGBW7J","2KRZHYFE","V2QEH7U8","YZ4L33XG","JYNS7HEQ","CJV2G2VD","TQX4YYNF","UG9SCMVB","ANYMMKJV","XXHL6UTA","PD347VZE","VUHCMXBL","S6JDRC7D","Y4ALBJZ4","YYDRR7GV","PUS8W2SB","JZXUR582","7BR2FM49","2UECBGNE","EEBNCZN4","GGZM8GP7","2ZBHXX75","KQ6FT7QY","5EQNPWSR","V8MCW3PG","JYWG7VX9","E77MQC3W","PP5Q5P5E","6QQ49WC9","CYBMS2JV","ES4FQSP5","7QCEZS5Y","REE8J63H","4PM7YQUY","ZPG8VEG9","NMQY2DE5","B89HXVKY","YSDNYXWE","CXRDQX4Z","NPV2PB38","VRQ5ZQJP","MKT2W4SB","ZMYRFQ7A","PJZHFYBX","5EQBKX6N","U7G3AMXQ","CT7QLRK6","EN98VSKS","F4RER4QU","MF6JP9SX","U5PHVTF7","BNQ234YX","JEQR8QFN","YY7Y2GJW","WZWWCSQQ","SH2RYHDS","FWJRLBNF","YN48VK2U","29HJVD85","3MS3LWEK","GM3QR87H","PRB97RWM","JU2GUC8Y","WGQX43E2","9GNHXENJ","925BMA46","N977QFBY","L6DJHHEF","5G4EMEBH","4VFY6CRD","GFZP45TJ","ZDSW7HLG","LW65RG8M","SSRSMTMX","3JRHNTWW","KFLLA5UX","QGDBLVJQ","9WHKHUNV","FZ4V67X3","NNJHCVLK","47B34JJ8","AB8ERJ7W","8KCLRGBP","VGVE44L7","HK6RK55S","W4UXZ8ZR","U53ULTBS","KCXBTAWF","DH7HLPXY","BG4ZLTVD","MJDXMBSG","44KD6P7B","6PE2ZBNL","5P86PX94","F8QKRFBY","TYHXNH5V","JVFG3634","EMLQAX5B","TY7X3ZYE","2XJ2CPGD","B3B3Y5A7","9TNE3QLZ","6Y7TKW54","3ED6683T","JZHXNAZM","QCFAMVZ6","JURZZHJX","FZNTPMF2","TUNSW6PX","59X3Q3RG","4VMKCETE","654Z5L85","TX2K5P87","NMRBBVYQ","QJXKLYK2","RP5NQHCG","L5SU758V","V4Y3DHKE","2QD2ZEU5","FE63KMFJ","PNVYP2H7","LFQEAP6X","U6MTZ7E6","CSTU323R","HSQ4XRCW","6GLA6GLZ","A9UJTSWU","7A5YXY27","8BJ4FQRU","RCU38WTX","KJ8FKDNV","FXZ28WKD","7X5PNRM2","Y8T2BJXH","32XHQCQE","L742R544","Z9882LEU","NWFG27YZ","HX5YCF8R","WYS5D4WT","HMLG6WFT","S37864Q2","R2SYW63U","TXNGLHD6","294GABCX","5RKZ4EF5","DBREQA32","AH2Q73QT","PEXGWX7R","X5N8NTYK","FBFNFFNV","7JHVSMDL","HSZ8TYAH","UX96VY2G","6Y56XH52","ZPGYVVL2","RG8VCJZK","4WKM4PC6","WV5ATL8V","FFRBRJEE","SZNVH8KP","CNM4GW7T","JJE555EM","CRMTBK77","3U365PKN","LL6EN6RU","4BLNESYL","82ANHVYC","4WWF9R3G","GXG37QXT","SEXUYDK5","QH7Z7SYF","85U8G3YZ","DF4PWTGJ","UFP3GHQJ","FYZ27TWH","KAPRWWPT","54QDXR4Y","8Q463KTC","ZMBUZDCU","GH6SSLC2","C3BGY2K8","HGBPF5PW","4LHPSJTW","2TSRBELX","PJYSG8CV","EH8LYT6K","4C3R6W27","FLSX3NVP","CBJKJY8R","T4WPKH9G","VHTWDX2A","YSPJPZG9","LP2EXMST","HVS44WHP","PMH577L3","8MD96BMD","JHET4SX5","EZMBMNZG","UYPMHEUC","G4CL4T8J","4C88H6K9","BTRTFKQ9","J28UGJE5","4E82M82G","QUBR74AM","BZFNNN4R","24URASMT","RYN3YFH2","Z3JF6F7V","3Y8NGLUR","KZBCPHYX","LWTHTQE7","MZHK84J3","QCGGMYJ4","77VU7GF3","ETX5P63Q","5VDRNZM7","G4TXJGDY","VCMQV8X9","YXZHEQTH","ERGBJWC8","Y8Q6U38S","SAGNCD7L","LE65NCG7","EYUT44FP","TRZK84LY","HN533UZG","64CBJXPH","J6R8Q4WE","725W8MXR","QY3XUQRY","WGG3JUGZ","R2AHXKGX","VAW39YGZ","RNZHF8NJ","6ETSVE25","YKPZ4BMW","84G8DTWQ","LD8HGUQD","526ST73U","8WP2LMWG","B5QNJEVF","ULV4UNLB","CPXUW9ZZ","MRYMSE2W","UJ5BHVM5","JNTMX4NQ","LMH2CT6R","3YHKS7AR","7A6Q4WDE","F5L8ZW6B","Z47FZNUR","ZWU4Z2H8","3LPSLNYL","6EWDMWHR","GNVWUDPE","ZV6ATPXH","62QTWBPG","MHQFC5FL","HABZUT56","CSLMATSQ","H6P4C5ZH","9SF3J8Z4","H2DLNTKM","APEBBVPG","6RK3M3TM","6G8YEQ4V","GYGSXUJT","RCPAKSDC","QRE3YXGJ","YLR7S87W","XU3YLPUX","X5772PXH","4LYH82F6","DF2FZBNF","XDY5DQW7","QPTUVE8G","5W33X8YM","T2SYVBQV","82RM4CQF","6YR4WPS5","NXWYF6NP","HGD2SAAS","45D23M8C","K73M5V3K","44PV7FKD","MKMFY44T","QBSD54EE","J3GG8CC8","ZJCJQ3LP","G2Y2NMQL","HYZPFZPY","M36CTBTY","8JTKYFYB","PRKHHHLK","PSUKPDDY","S48ZRVXY","CG7CKEZG","UVYUJBKE","BYYDWV2K","PBX4AVPX","F3UDJEQA","6QUA2ZS5","U2ST2665","BTC3NCV5","ZBB2P56K","9FMET8GK","4GDKB33N","MJVV48R4","UHC6KCVT","TYFAVQ7N","VWKBRKZZ","NULHWZ5J","DNMG62ML","Q832VY6T","N6GWG58P","UQULRRH8","6ZYFNSXK","WLDV6UJR","XJH3N82P","ZM73P2LX","ZGTUJKG6","R53LDT78","L766F8LG","NDRS54TK","WARWAFL6","EHYDNAW8","M48DZZ5Q","RY9MFJQU","F8SZP63G","WKRG2A34","JSXA67W6","4DWDP4MJ","TFT35RR4","2QNJZLET","CJGGHPKN","L3QF9CLT","MJSEWMT8","ERZ9Q4BH","54K5F2RG","R4CXY36P","TEKV7JDW","KWFVHHLX","F4VBFLH5","THNDSRSJ","V7NY2MVF","CWUB3TZ6","C6Z3QFJR","2PY8XTCM","YTTRF5ZB","7C9ZZPJ6","6T6H2UBY","5MKPCBCD","C7ZK4NXC","57KYMHRT","HAEY2XHB","WM357LVM","8XDY6LVW","FK769LSV","5JJ7BGJA","MDA3VKDP","C77EBQKP","F2VNTLBX","F4L3KP7E","6NDPAR92","WQ6FZMBC","8GYAJMH4","H56N9LMX","SWHXVRWC","SG6NZBF9","VBT5BW2Z","56P2EDGF","6R5YYNUW","A38M9BNJ","4HHPYVGE","W93JBS3S","JQ2EZG8P","UFDPHRGL","VR6BTGRZ","P3ASWS4Y","K7HLZ8QS","SPPQC4QN","ZRLFBFYS","X57K7TBK","ZJ8HNE3T","BUMZX2HF","LAVEAP38","BGEYJMSB","DVGCBNR6","JEG2RAYV","4JRSAHE9","CQ3NWWBP","E7QWHKXG","4ENK9TZP","GPXL6Q3P","CNQX5QCN","3RYSZYB2","XGPYVPQY","TCHHZL34","23G4C7HG","VVU22EGF","ERE4VUKJ","VAXCT2JP","FZPBFEVT","RJ9P8U5X","D8YFEJYZ","LDGDJM4R","XN3FPVTM","6LDEDM3V","A5QRVYZV","WZHRL2HA","QQLRYACW","RMZYVZHN","DR2BZJAP","H87M3SAP","QL2UCKHE","W4SFMKGE","V6HDMQYQ","RVCAZERD","GUS4UCYV","VYYSRSMS","2TA9T4VG","S297PX8N","WNFF2FJE","H4LAE4QV","55SH2TVD","H3P6EWGB","CV2N38RP","X3XX3586","3KQL4C78","PJJVSPXR","KQLDY87J","CVCUMLQB","HTQYRZ2J","NNVV83QJ","C98Z4LDU","85G29K9B","7HJSXQR5","867TE48H","TECHB8LM","NE7KUE23","L4XG8W6Y","KUBTTYN2","YS2CBT33","P58BXUPK","XCE6SCXY","YA5Q2BNV","X6QA726Z","J3TDK3L5","64TB4RR2","85Q8HFTE","6CC8MMAN","RXXJJ663","G9ZBWD83","U52JE3WU","KQK4CPRL","C4FDK8UG","M627Z65D","4T8GC3U4","N84RDV66","XFFJMP3P","V8YS592H","L52BZPP6","BHPGC7YT","U2VAZTTA","KP76BGPH","SRQB8LRZ","PRQTHT8K","XX2JJYQP","T8VY7SFH","HXWZG63D","XVESGX3X","C7UV65XK","JXSHLCS5","VSHAERVC","3XHJGTYH","8ZHP6EDX","PYLV4F2L","CH97VXM9","ZUM4Z7KU","3PEJX7YF","3H27CZG5","VGKXUKPX","XQP7DSHS","SB2DVWQW","SXQ8DN4V","C9PDYM3G","NTBRRSY7","FNRZQPU8","Q2MVHRSK","HQXNXJCX","7WX7E2UJ","EMCQLSZK","NVJ5PA3W","P75L3X8D","WJX4QJPD","JCZP7FKZ","YHNGFBKH","H2MT8LB5","CK7BKCY4","JDX4WHJJ","WYPNGVZ7","PVZEGKB9","2B6JHX7F","ZZGHC5A6","3833X6TC","RRK26H3L","2V5MPZA8","NSX88H2D","NAVM5VPA","TGS2RUBH","ZMQ5CQHS","6FTZH4P4","QLHPQQUL","KVCKUJ74","3ASR8C4P","BTLGQSFS","U2JS96UY","G8MYR7N2","GD2F58KU","VFRUNZ74","23MUN4UU","F22P6GXK","4K99D3HU","Y4Z6YNQY","NBLN64LG","PVT25M6R","7G3TSWV6","C66HRR89","E3XRUGER","FCKBGH6P","FGE68GBH","4YWMDCC9","JG6H47M8","6QB3KMG2","LDNET6BF","ZQ6EFY6F","33VQVP6L","9CJVUNFK","5S94MS8R","RUL3VH4Q","JAMDXQ7R","LCJ9BVLU","YKTGXRND","25DTPULK","XHEMVS5R","ZVCK7K4G","UHB32WJA","73Z2GL6L","CSSVM35L","FV9QSL88","3FAE3NVS","TJNFHUKD","HZWGPYEN","WXSUYKDR","8DKS75ZD","58ZKA5Y8","F6GMT7WL","SN5T89BK","ULDQYKF6","PVN268JM","TXMH4U3V","YK4H45UP","JFZPFHVZ","JSWCKUU2","VZMXMXQ6","JXMHJLD6","5QMFSKFE","YP4XFZVW","JGJ4WTFH","5AZNYW6M","V3WWBKLY","HM9B6NRZ","LX7YPMF4","T7UV5C3S","PRVEQ6JU","TXN6RVSU","2V5PBQRZ","V8TBMYHH","RZJX63ZG","PZVDX8SX","EKBZRFDF","7H6GJPH2","YKYVFDEE","NAWEXTE3","DX9TDFHX","JTA7FHRS","8JRS8A8G","DUEJM2R2","U5PG66PG","MYGYA6AJ","LYKRN5LZ","S2VUYUT8","PFMB3DMU","VBLQYGLF","2YSVGJEP","D8GCM9GZ","N6CNBYYW","CJMSG86X","QW85VXHQ","ZR2576Q7","B8242D9C","UUVRE4QH","DF2PMGT7","8MC7JCYM","FLTDZWD3","DP44YX5N","H2XM7QB4","9WXNQQ7S","5M3HGAEM","3ZZEB36N","DZY72SGX","5RKMDF7T","97HRB5VS","FQ6ZPSEN","H34GKYE2","WHFC6LAB","45J6T53C","CQ3LZUEF","ZG873P2F","R9PSF7YG","FUETPGUQ","VEB4DTTZ","YYQEHUY4","T8QRG6U4","RMQ3K7NR","Q6BVXKFW","KETZLQ9S","J7SSNN2W","HP8LMMJD","ZSALBX5D","8SMH9NYQ","DBCC32SJ","HSRMH4K8","YBLU327Q","82Y8N8EX","LHWK26X2","QRQY2LXC","LN7XJCFY","ECS4D87Q","P4BZ3CSF","Z64VS6YY","VEWEKRKU","NWFU7QPY","C3ZYEEDE","EY8A5ZSK","N7LE7NKW","GWRXAPMZ","BYSYM5EF","7W5Q2T75","SYKUSY4G","468DRFHJ","HXMBV8QP","BGRQUVVL","V7JYLZQM","GP4PLGUV","BR3UGEKX","PKXZT93J","Y854ANMS","DYN2M4F2","3XV86QWL","KCMDJWBC","JU6L42CP","WB8M36MF","H8RA4K6Q","NNPQUEMP","G3DK3BE6","NVSKCR4S","UNTYK96F","HYFZVEMC","4U3HTZLW","TB7YX8MG","72U47KG8","5ZCE5BGJ","S7N5EEGG","PCGVEG8A","6EWDC8MY","ZGHP2WQG","5DTGRRSR","HMBK23U2","GZ5AZMPS","XGPL6Z65","E8RHGCST","JSFE9WHH","62E557LL","FH77GVEV","BD24MZB5","WK4XSHS2","NELS2ZU2","BXGARCBG","LBZREDTT","CDWJQ4KG","Z2SBZVD7","TAKWF4WY","UNPE8HQW","H8F63AS4","474EVKPC","VJ8VB4RL","7UQ3NB3H","TC5WV796","UG4KVGAP","TX44UBUY","U76W8DUQ","XPQKQQYS","LLDBXJCC","Q8SLWD4T","8GXLLSH9","XNB5EJEQ","5HKUM7C2","7B86PM23","GZ5BSVL2","NEYXYZ3E","KVDEED99","YNV82MQ2","UTJ3KVWF","8Q65AKHF","WJKWKJRK","4LX25W7W","Y7MBHBX8","ETQCPGGC","TY3S46XY","BDSAJ42E","VN4VMGY6","FWCPTRF2","ZCCE72L5","DWZ849KM","EUEPEM2P","7SCSRXXK","8QJML6VV","T7BWKMGR","3S43DNQF","8ZT6K2BM","R4ZBRKZF","SX2QKMZ6","7M6CS5SD","GLSHMC22","ZZ8TAMVY","5E7FWZG2","8WDLDM2B","TWTCC3U3","ML3EEB4S","F473ZL4U","QG8GXVB5","FLHWP6JE","766JNBL6","8ENDUSNA","ZFKQ7CGW","5Z84MY3X","36SET87Z","7LYF2KVM","5UHLSBZU","3MKSNKWC","ULVPN86L","BNG8FV37","5H6NAB7N","PJT67AJX","7G8N8SUX","H9JXPQDJ","4TYYZE7C","2EJ94ZTJ","6T5KMVBC","Y6MJWMDM","CPAY9HQD","TSKJLGV3","TSJVBZ3L","BE9XQK4P","3KEW2MUD","RTELLJ6X","32WG72X8","DA6JS3VT","AYQAYKRP","3EMQMB54","5XB6PZ3X","WKQZZQZE","8X52KDFE","2Q9MQHAX","9ZXULPP5","D7CPVWYU","F4ZJJQD8","CL8TAUNF","TZUE872T","KM5NC6V8","BQ6VX7FF","GENUUGKA","C7KDTXF7","XPZMLUUJ","JHRD25U7","BTFWRZVK","7JHVM22Z","8HJN42FT","X8XMP4HN","AMKDACEF","ZBNQ6NNL","7AGZET2P","8RKEJR3J","8JATBBGJ","H3FEVGYW","PT49EDEJ"); + int i = 11150; for (String s : cardList) { - System.out.println("INSERT INTO `yitisheng-test5`.`yx_vip_card` (`id`, `card_num`, `sku_code`,`valid_date`) VALUES" + - " ('"+i+"', '"+s+"', NULL, '1002', '2023-08-31 23:59:59');"); + System.out.println("INSERT INTO `yitisheng-test5`.`yx_vip_card` (`id`, `card_num`, `sku_code`,`valid_date`,'create_by') VALUES" + + " ('"+i+"', '"+s+"', NULL, '1002', '2024-08-31 23:59:59','带货');"); i++; } - }*/ + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolExamMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolExamMajorController.java new file mode 100644 index 0000000..d387558 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolExamMajorController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.yx.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.yx.entity.YxSchoolExamMajor; +import org.jeecg.modules.yx.service.IYxSchoolExamMajorService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 校考专业数据表 + * @Author: jeecg-boot + * @Date: 2024-04-04 + * @Version: V1.0 + */ +@Api(tags="校考专业数据表") +@RestController +@RequestMapping("/yx/yxSchoolExamMajor") +@Slf4j +public class YxSchoolExamMajorController extends JeecgController { + @Autowired + private IYxSchoolExamMajorService yxSchoolExamMajorService; + + /** + * 分页列表查询 + * + * @param yxSchoolExamMajor + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "校考专业数据表-分页列表查询") + @ApiOperation(value="校考专业数据表-分页列表查询", notes="校考专业数据表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxSchoolExamMajor yxSchoolExamMajor, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolExamMajor, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxSchoolExamMajorService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param yxSchoolExamMajor + * @return + */ + @AutoLog(value = "校考专业数据表-添加") + @ApiOperation(value="校考专业数据表-添加", notes="校考专业数据表-添加") + @RequiresPermissions("yx:yx_school_exam_major:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxSchoolExamMajor yxSchoolExamMajor) { + yxSchoolExamMajorService.save(yxSchoolExamMajor); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param yxSchoolExamMajor + * @return + */ + @AutoLog(value = "校考专业数据表-编辑") + @ApiOperation(value="校考专业数据表-编辑", notes="校考专业数据表-编辑") + @RequiresPermissions("yx:yx_school_exam_major:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody YxSchoolExamMajor yxSchoolExamMajor) { + yxSchoolExamMajorService.updateById(yxSchoolExamMajor); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "校考专业数据表-通过id删除") + @ApiOperation(value="校考专业数据表-通过id删除", notes="校考专业数据表-通过id删除") + @RequiresPermissions("yx:yx_school_exam_major:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + yxSchoolExamMajorService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "校考专业数据表-批量删除") + @ApiOperation(value="校考专业数据表-批量删除", notes="校考专业数据表-批量删除") + @RequiresPermissions("yx:yx_school_exam_major:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.yxSchoolExamMajorService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "校考专业数据表-通过id查询") + @ApiOperation(value="校考专业数据表-通过id查询", notes="校考专业数据表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + YxSchoolExamMajor yxSchoolExamMajor = yxSchoolExamMajorService.getById(id); + if(yxSchoolExamMajor==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxSchoolExamMajor); + } + + /** + * 导出excel + * + * @param request + * @param yxSchoolExamMajor + */ + @RequiresPermissions("yx:yx_school_exam_major:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YxSchoolExamMajor yxSchoolExamMajor) { + return super.exportXls(request, yxSchoolExamMajor, YxSchoolExamMajor.class, "校考专业数据表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("yx:yx_school_exam_major:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, YxSchoolExamMajor.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java index 43dcc98..5242d14 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java @@ -125,4 +125,11 @@ public class YxCalculationMajor implements Serializable { @Excel(name = "其他分数限制", width = 15) @ApiModelProperty(value = "其他分数限制") private java.lang.String otherScoreLimitation=""; + + /** + * 考试类型(统考/校考) + */ + @Excel(name = "考试类型(统考/校考)", width = 15) + @ApiModelProperty(value = "考试类型(统考/校考)") + private String kslx; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolExamMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolExamMajor.java new file mode 100644 index 0000000..f18c024 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolExamMajor.java @@ -0,0 +1,75 @@ +package org.jeecg.modules.yx.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 校考专业数据表 + * @Author: jeecg-boot + * @Date: 2024-04-04 + * @Version: V1.0 + */ +@Data +@TableName("yx_school_exam_major") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="yx_school_exam_major对象", description="校考专业数据表") +public class YxSchoolExamMajor implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**院校编码*/ + @Excel(name = "院校编码", width = 15) + @ApiModelProperty(value = "院校编码") + private java.lang.String schoolCode; + /**院校专业id*/ + @Excel(name = "院校专业id", width = 15) + @ApiModelProperty(value = "院校专业id") + private java.lang.String schoolMajorId; + /**校考分数*/ + @Excel(name = "校考分数", width = 15) + @ApiModelProperty(value = "校考分数") + private java.math.BigDecimal schoolExamScore; + /**校考排名*/ + @Excel(name = "校考排名", width = 15) + @ApiModelProperty(value = "校考排名") + private java.math.BigDecimal schoolExamRanking; + /**年份*/ + @Excel(name = "年份", width = 15) + @ApiModelProperty(value = "年份") + private java.lang.String year; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java index e4bbbcd..2cb8013 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java @@ -157,4 +157,11 @@ public class YxSchoolMajor implements Serializable { */ @ApiModelProperty(value = "外语成绩限制") private BigDecimal englishScoreLimitation; + + /** + * 考试类型(统考/校考) + */ + @Excel(name = "考试类型(统考/校考)", width = 15) + @ApiModelProperty(value = "考试类型(统考/校考)") + private String kslx; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolExamMajorMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolExamMajorMapper.java new file mode 100644 index 0000000..d8a40ef --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolExamMajorMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.yx.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.yx.entity.YxSchoolExamMajor; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 校考专业数据表 + * @Author: jeecg-boot + * @Date: 2024-04-04 + * @Version: V1.0 + */ +public interface YxSchoolExamMajorMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml index 2bd52a0..318fcd9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml @@ -5,7 +5,7 @@ INSERT INTO ${tableName} (id, score_id, school_code, major_code, major_name, enrollment_code, tuition, detail, category, rules_enroll_probability, batch, student_old_converted_score, student_converted_score, enroll_probability, probability_operator, create_time, major_type, major_type_child, plan_num, main_subjects, - limitation, other_score_limitation,rules_enroll_probability_sx) + limitation, other_score_limitation,rules_enroll_probability_sx,kslx) VALUES ( @@ -13,7 +13,7 @@ #{item.enrollmentCode}, #{item.tuition}, #{item.detail}, #{item.category}, #{item.rulesEnrollProbability}, #{item.batch}, #{item.studentOldConvertedScore}, #{item.studentConvertedScore}, #{item.enrollProbability}, #{item.probabilityOperator}, #{item.createTime}, #{item.majorType}, #{item.majorTypeChild}, #{item.planNum}, - #{item.mainSubjects}, #{item.limitation}, #{item.otherScoreLimitation},#{item.rulesEnrollProbabilitySx} + #{item.mainSubjects}, #{item.limitation}, #{item.otherScoreLimitation},#{item.rulesEnrollProbabilitySx},#{item.kslx} ) @@ -47,7 +47,8 @@ LEFT JOIN yx_school_child sc ON sc.school_code = cm.school_code LEFT JOIN yx_school_research_teaching srt ON srt.school_id = sc.school_id LEFT JOIN yx_school s ON s.id = sc.school_id - WHERE cm.rules_enroll_probability is not null + WHERE 1=1 + /*cm.rules_enroll_probability is not null*/ AND cm.score_id = #{queryvo.scoreId} @@ -189,6 +190,9 @@ AND s.school_nature= #{queryvo.schoolNature} + + AND cm.kslx = #{queryvo.kslx} + ORDER BY enroll_probability desc diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolExamMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolExamMajorMapper.xml new file mode 100644 index 0000000..f6d54d9 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolExamMajorMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml index 7c2a632..cdd505a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml @@ -38,6 +38,7 @@ sm.enrollment_code as enrollmentCode, sm.major_code, sm.tuition as studyCost, + sm.kslx, sm.plan_num as planNum FROM yx_school_major sm LEFT JOIN ( SELECT major_code,major_desc,semester,first_level_discipline FROM yx_major GROUP BY major_code ORDER @@ -45,7 +46,8 @@ LEFT JOIN (SELECT school_id,school_code FROM yx_school_child group by school_code) sc ON sc.school_code = sm.school_code LEFT JOIN yx_school s ON s.id = sc.school_id LEFT JOIn yx_first_level_disciplines fld ON fld.id = m.first_level_discipline - WHERE sm.rules_enroll_probability is not null + WHERE 1=1 + /*sm.rules_enroll_probability is not null*/ AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sc.schooL_code like concat('%',#{queryvo.schoolName},'%') or sm.major_name like concat('%',#{queryvo.schoolName},'%')) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolExamMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolExamMajorService.java new file mode 100644 index 0000000..4de988d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolExamMajorService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.yx.service; + +import org.jeecg.modules.yx.entity.YxSchoolExamMajor; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 校考专业数据表 + * @Author: jeecg-boot + * @Date: 2024-04-04 + * @Version: V1.0 + */ +public interface IYxSchoolExamMajorService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index 6314138..b1a2c62 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -76,6 +76,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImplr.getSchoolCode().equals("1470")).collect(Collectors.toList()); long endTime = new Date().getTime(); log.warn("测算专业录取率-耗费时长:" + (endTime - startTime)); //保存结果到用户的专业结果表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java index 86c0a67..4bd8f17 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java @@ -160,9 +160,7 @@ public class YxMajorServiceImpl extends ServiceImpl impl recommendMajorDTO.setMajorName(yxSchoolMajor.getMajorName()); recommendMajorDTO.setMajorCode(yxSchoolMajor.getMajorCode()); recommendMajorDTO.setBatch(yxSchoolMajor.getBatch()); - /*recommendMajorDTO.setProbabilityOperator(yxSchoolMajor.getProbabilityOperator()); - recommendMajorDTO.setRulesEnrollProbability(yxSchoolMajor.getRulesEnrollProbability());*/ - /*recommendMajorDTO.setMajorDetail(yxSchoolMajor.getDetail());*/ + recommendMajorDTO.setKslx(yxSchoolMajor.getKslx()); lambdaQueryWrapper.clear(); lambdaQueryWrapper.orderByDesc(YxHistoryMajorEnroll::getYear); lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getSchoolCode,queryRecommendMajorVO.getSchoolCode()); @@ -170,7 +168,7 @@ public class YxMajorServiceImpl extends ServiceImpl impl lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,yxSchoolMajor.getBatch()); lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getCategory,queryRecommendMajorVO.getCognitioPolyclinic()); historyMajorEnrollList = yxHistoryMajorEnrollService.list(lambdaQueryWrapper); - if (CollectionUtils.isEmpty(historyMajorEnrollList)) { + if ((StringUtils.isNotBlank(yxSchoolMajor.getKslx()) && "统考".equals(yxSchoolMajor.getKslx())) && CollectionUtils.isEmpty(historyMajorEnrollList)) { continue; } historyMajorEnrollList = historyMajorEnrollList.stream().filter(h->StringUtils.isNotBlank(h.getRulesEnrollProbability())).collect(Collectors.toList()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolExamMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolExamMajorServiceImpl.java new file mode 100644 index 0000000..4c36d7f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolExamMajorServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.yx.service.impl; + +import org.jeecg.modules.yx.entity.YxSchoolExamMajor; +import org.jeecg.modules.yx.mapper.YxSchoolExamMajorMapper; +import org.jeecg.modules.yx.service.IYxSchoolExamMajorService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 校考专业数据表 + * @Author: jeecg-boot + * @Date: 2024-04-04 + * @Version: V1.0 + */ +@Service +public class YxSchoolExamMajorServiceImpl extends ServiceImpl implements IYxSchoolExamMajorService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java index b1f6967..884aede 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java @@ -84,7 +84,13 @@ public class YxSchoolServiceImpl extends ServiceImpl i //获取 院校下的上一年招生信息 List schoolCodeList = dtoPage.getRecords().stream().map(MiniSchoolDTO::getSchoolCode).collect(Collectors.toList()); Map historyMajorEnrollMap = yxHistoryMajorEnrollService.getDataGroupBySchoolCodeAndMaxYear(schoolCodeList); - + //获取校考数据 + LambdaQueryWrapper schoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + schoolMajorLambdaQueryWrapper.select(YxSchoolMajor::getSchoolCode); + schoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getKslx, "校考"); + schoolMajorLambdaQueryWrapper.groupBy(YxSchoolMajor::getSchoolCode); + List xkList = yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper); + Set schoolCodeSet = xkList.stream().map(YxSchoolMajor::getSchoolCode).collect(Collectors.toSet()); //获取 院校的招生数量 Map planNumMap = yxSchoolMajorService.getSchoolMajorPlanSumByTypeAndCode(currentUserScore.getProfessionalCategory(), schoolCodeList); @@ -93,6 +99,9 @@ public class YxSchoolServiceImpl extends ServiceImpl i Integer planNum=0; YxHistoryMajorEnroll yxHistoryMajorEnroll = null; for (MiniSchoolDTO record : dtoPage.getRecords()) { + if (schoolCodeSet.contains(record.getSchoolCode())) { + record.setKslx("校考"); + } //关联录取分数 yxHistoryMajorEnroll = historyMajorEnrollMap.get(record.getSchoolCode()); if (yxHistoryMajorEnroll != null) {