收费管理增加班主任名称和班级名称

src/main/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImpl.java

@@ -131,11 +131,15 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 .like(dto.getJfzt() != null && !"".equals(dto.getJfzt()), PbVXsxxsfytb::getJfzt, dto.getJfzt())
                 .leftJoin(XjrUser.class, XjrUser::getCredentialNumber, PbVXsxxsfytb::getPersonalid)
                 .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
+                .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
                 .leftJoin(BaseStudent.class, BaseStudent::getUserId, XjrUser::getId)
                 .leftJoin(PbSemesterConfig.class, PbSemesterConfig::getBeltcode, PbVXsxxsfytb::getBeltcode)
                 .leftJoin(BaseSemester.class, BaseSemester::getId, PbSemesterConfig::getBaseSemesterId)
+                .leftJoin("xjr_user x1 on x1.id = t3.teacher_id")
+                .select("x1.name as teacher_name")
                 .selectAs(BaseSemester::getId, PbVXsxxsfytbPageVo::getBaseSemester)
                 .selectAs(XjrUser::getId, PbVXsxxsfytbPageVo::getUserId)
+                .selectAs(BaseClass::getName, PbVXsxxsfytbPageVo::getClassname)
                 .selectAs(BaseSemester::getName, PbVXsxxsfytbPageVo::getBaseSemesterCn)
                 .select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbPageVo.class).contains(x.getProperty()))
                 ;

src/main/java/com/xjrsoft/module/student/vo/PbVXsxxsfytbPageVo.java

@@ -225,4 +225,7 @@ public class PbVXsxxsfytbPageVo {
     @ApiModelProperty("主键")
     private String pksfxxytb;
 
+    @ApiModelProperty("班主任名称")
+    private String teacherName;
+
 }