|
|
@@ -9,7 +9,9 @@ import com.xjrsoft.module.base.entity.BaseSemester;
|
|
|
import com.xjrsoft.module.student.dto.PbVXsxxsfytbExcelDto;
|
|
|
import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
|
|
|
import com.xjrsoft.module.student.dto.PersonalPortraitFeeInformationDto;
|
|
|
+import com.xjrsoft.module.student.entity.BaseStudent;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
+import com.xjrsoft.module.student.entity.BaseStudentUser;
|
|
|
import com.xjrsoft.module.student.entity.PbSemesterConfig;
|
|
|
import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
|
|
|
import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
|
|
|
@@ -117,11 +119,12 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
|
|
|
.disableSubLogicDel()
|
|
|
.like(dto.getFeeitemname() != null && !dto.getFeeitemname().equals(""), PbVXsxxsfytb::getFeeitemname, dto.getFeeitemname())
|
|
|
.like(dto.getName() != null && !dto.getName().equals(""), PbVXsxxsfytb::getFeeobjname, dto.getName())
|
|
|
- .eq(dto.getStudentId() != null && !dto.getStudentId().equals(""), PbVXsxxsfytb::getStudentcode, dto.getStudentId())
|
|
|
+ .eq(dto.getStudentId() != null && !dto.getStudentId().equals(""), BaseStudent::getStudentId, dto.getStudentId())
|
|
|
.in(dto.getClassIdList() != null && !dto.getClassIdList().isEmpty(), BaseStudentSchoolRoll::getClassId, dto.getClassIdList())
|
|
|
.eq(dto.getSemesterId() != null && dto.getSemesterId() > 0, PbSemesterConfig::getBaseSemesterId, dto.getSemesterId())
|
|
|
.leftJoin(XjrUser.class, XjrUser::getCredentialNumber, PbVXsxxsfytb::getPersonalid)
|
|
|
.leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
|
|
|
+ .leftJoin(BaseStudent.class, BaseStudent::getUserId, XjrUser::getId)
|
|
|
.leftJoin(PbSemesterConfig.class, PbSemesterConfig::getBeltcode, PbVXsxxsfytb::getBeltcode)
|
|
|
.leftJoin(BaseSemester.class, BaseSemester::getId, PbSemesterConfig::getBaseSemesterId)
|
|
|
.selectAs(BaseSemester::getId, PbVXsxxsfytbPageVo::getBaseSemester)
|
