From 2ad30ffc4d23c578dfd035415f4947bcd8d9aa02 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Wed, 4 Dec 2024 19:48:44 +0800 Subject: [PATCH] =?UTF-8?q?getData=E6=B7=BB=E5=8A=A0=E5=85=A8=E6=A0=A1?= =?UTF-8?q?=EF=BC=88=E4=B8=8D=E5=90=AB=E8=89=BA=E4=BD=93=E7=BE=8E=E5=A4=96?= =?UTF-8?q?=E8=AF=AD=EF=BC=89=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/CenterServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java index dc6b5ada..5fe80ba5 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java @@ -262,7 +262,18 @@ public class CenterServiceImpl extends ServiceImpl implement Cet4_majorQW.clear(); Cet4_majorQW.select(Cet4_major::getCode).eq(Cet4_major::getEntrydate, entryDate).eq(Cet4_major::getState, "在校"); allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); - } else if (college.equals("专升本")) { + }else if(college.equals("全校（不含艺体美外语）")) { + totalName = "全校"; + Cet_4QW.eq(Cet_4::getEntrydate, entryDate) + .eq(Cet_4::getBatch, batchList.get(i)) + .eq(Cet_4::getState, "在校"); + Cet_4QW.notIn(Cet_4::getCollege, Arrays.asList("体育科学学院", "美术学院", "音乐学院")); + Cet_4QW.notIn(Cet_4::getMajorname, Arrays.asList("英语","翻译", "商务英语", "表演","广播电视编导", "录音艺术", "播音与主持艺术","动画", "摄影", "数字媒体艺术")); + Cet4_majorQW.clear(); + Cet4_majorQW.select(Cet4_major::getCode).eq(Cet4_major::getEntrydate, entryDate).eq(Cet4_major::getState, "在校"); + allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); + + }else if (college.equals("专升本")) { totalName = "全校"; Cet_4QW.eq(Cet_4::getLevel, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); //查询该年级的专升本在籍学生