新生数据处理

src/test/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImplTest.java

@@ -48,6 +48,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -138,11 +139,12 @@ class StudentReportRecordServiceImplTest {
         baseNewStudentMPJLambdaWrapper
                 .select(BaseNewStudent::getId)
                 .select(BaseNewStudent.class, x -> VoToColumnUtil.fieldsToColumns(BaseNewStudent.class).contains(x.getProperty()))
-                .leftJoin(BandingTaskClassStudentSure.class, BandingTaskClassStudentSure::getNewStudentId, BaseNewStudent::getId)
-                .eq(BaseNewStudent::getDeleteMark, DeleteMark.NODELETE.getCode())
-                .eq(BandingTaskClassStudentSure::getDeleteMark, DeleteMark.NODELETE.getCode())
-                .isNotNull(BandingTaskClassStudentSure::getBandingTaskClassId)
-                .eq(BaseNewStudent::getId, 1815323902188498989L)
+                .innerJoin(BandingTaskClassStudent.class, BandingTaskClassStudent::getNewStudentId, BaseNewStudent::getId)
+                .innerJoin(BandingTaskClass.class, BandingTaskClass::getId, BandingTaskClassStudent::getBandingTaskClassId)
+                .innerJoin(BandingTask.class, BandingTask::getId, BandingTaskClass::getBandingTaskId)
+                .eq(BandingTask::getGradeId, 1868532405673439232L)
+                .isNotNull(BandingTaskClassStudent::getBandingTaskClassId)
+                .eq(BaseNewStudent::getId, 1815323902188498986L)
                 ;
         List<BaseNewStudent> baseNewStudents =  newStudentMapper.selectJoinList(BaseNewStudent.class, baseNewStudentMPJLambdaWrapper);