From ac0523706f67a07f7f005e379422caf2e5f00521 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Tue, 10 Dec 2024 15:51:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8C=89=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=AF=B9=E6=AF=94=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=B9=B4=E7=BA=A7=E9=80=9A=E8=BF=87=E7=8E=87?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/service/impl/Cet_4ServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java index 78ea35d3..7ccea6d2 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java @@ -128,6 +128,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements if(college.equals("全校")){ collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getCollege)); }else{ + //TODO：majorname为空时存在异常 collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getMajorname)); } @@ -591,7 +592,9 @@ public class Cet_4ServiceImpl extends ServiceImpl implements if (getRateByEntryDateDtoParams.getMajor() != null && !getRateByEntryDateDtoParams.getMajor().isEmpty()) { cet4StudentCount.eq(Cet_4::getMajorname, getRateByEntryDateDtoParams.getMajor()); } - long allStudentCount = cet4Mapper.selectCount(cet4StudentCount); + cet4StudentCount.groupBy(Cet_4::getCode); + List allStudentList = cet4Mapper.selectObjs(cet4StudentCount); + long allStudentCount = allStudentList.size(); // 统计当前 entryDate 下的通过人数 //所有参加过四级考试的学生 Map attendMap4 = new HashMap<>(); From 5c17141343ffe4be2a6f71e57656c3aba1114e43 Mon Sep 17 00:00:00 2001 From: Cool <747682928@qq.com> Date: Thu, 12 Dec 2024 21:54:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9B=E5=85=AD=E7=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B8=85=E6=B4=97Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/entity/CetClean.java | 4 +- .../jeecg/modules/cet/clean/CetCleanTest.java | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/cet/clean/CetCleanTest.java diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java index 2bbc2395..dd3e2f3c 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java @@ -13,11 +13,11 @@ import lombok.experimental.Accessors; * @Date: 2024/09/09/20:45 * @Description: */ -@TableName("cet_4_20240907") +@TableName("cet_6_copy1") @Data @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="cet_4数据清洗实体类", description="仅用作cet_4数据清洗") +@ApiModel(value="cet数据清洗实体类", description="仅用作cet数据清洗") public class CetClean extends Cet_4 { diff --git a/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/cet/clean/CetCleanTest.java b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/cet/clean/CetCleanTest.java new file mode 100644 index 00000000..938089d5 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/cet/clean/CetCleanTest.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.cet.clean; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.jeecg.JeecgSystemApplication; +import org.jeecg.modules.entity.CetClean; +import org.jeecg.modules.entity.Cet_4; +import org.jeecg.modules.mapper.CetCleanMapper; +import org.jeecg.modules.mapper.Cet_4Mapper; +import org.jeecg.modules.service.CetCleanService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class) +public class CetCleanTest { + @Autowired + private CetCleanMapper cetCleanMapper; + @Autowired + private Cet_4Mapper cet4Mapper; + + @Test + public void cleanData() { + LambdaQueryWrapper actualQueryWrapper = Wrappers.lambdaQuery(Cet_4.class) + .select(Cet_4::getCollege) + .groupBy(Cet_4::getCollege); + List cet4s = cet4Mapper.selectList(actualQueryWrapper); + List collegeList = cet4s.stream() + .map(Cet_4::getCollege) + .collect(Collectors.toList()); + LambdaUpdateWrapper cleanUpdateWrapper = Wrappers.lambdaUpdate(CetClean.class) + .notIn(CetClean::getCollege, collegeList); + cetCleanMapper.delete(cleanUpdateWrapper); + } +}