实习管理查询调整

src/main/java/com/xjrsoft/module/internship/service/impl/InternshipPlanManageParticipantServiceImpl.java

@@ -27,7 +27,6 @@ import com.xjrsoft.module.internship.vo.InternshipPlanManageParticipantPageVo;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
-import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.service.IBaseStudentService;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
@@ -38,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -53,7 +51,6 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
     private final InternshipPlanManageMapper internshipPlanManageMapper;
     private final InternshipPlanClassMapper internshipPlanClassMapper;
     private final InternshipPlanTeacherMapper internshipPlanTeacherMapper;
-    private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
     private final IBaseStudentService baseStudentService;
     private final BaseStudentSchoolRollMapper baseStudentSchoolRollMapper;
     private final BaseClassMapper baseClassMapper;
@@ -186,7 +183,7 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
 
         List<InternshipPlanManageParticipant> list = this.list(
                 new QueryWrapper<InternshipPlanManageParticipant>().lambda()
-                        .eq(InternshipPlanManageParticipant::getInternshipPlanManageId, dto.getInternshipPlanManageId())
+                        .eq(dto.getInternshipPlanManageId() != null, InternshipPlanManageParticipant::getInternshipPlanManageId, dto.getInternshipPlanManageId())
                         .eq(InternshipPlanManageParticipant::getTeacherId, teacherId)
         );
         if(list.isEmpty()){
@@ -199,7 +196,7 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
         studentInfoPageDto.setInIds(list.stream().map(InternshipPlanManageParticipant::getParticipantUserId).collect(Collectors.toList()));
         studentInfoPageDto.setKeyWord(dto.getKeyword());
 
-        Page<BaseStudentInfoPageVo> mobilePage = baseStudentSchoolRollService.getMobilePage(page, studentInfoPageDto);
+        Page<BaseStudentInfoPageVo> mobilePage = baseStudentSchoolRollMapper.getMobilePage(page, studentInfoPageDto);
         PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(mobilePage, InternshipPlanManageParticipantPageVo.class);
         for (InternshipPlanManageParticipantPageVo vo : pageOutput.getList()) {
             vo.setEvaluateResult(collect.get(vo.getId()));
@@ -220,7 +217,7 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
         studentInfoPageDto.setInIds(list.stream().map(InternshipPlanManageParticipant::getParticipantUserId).collect(Collectors.toList()));
         studentInfoPageDto.setKeyWord(dto.getKeyword());
 
-        Page<BaseStudentInfoPageVo> mobilePage = baseStudentSchoolRollService.getMobilePage(page, studentInfoPageDto);
+        Page<BaseStudentInfoPageVo> mobilePage = baseStudentSchoolRollMapper.getMobilePage(page, studentInfoPageDto);
         PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(mobilePage, InternshipPlanManageParticipantPageVo.class);
         for (InternshipPlanManageParticipantPageVo vo : pageOutput.getList()) {
             vo.setEvaluateResult(collect.get(vo.getId()));