学生消费导出

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

@@ -5,6 +5,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbExcelDto;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
@@ -146,9 +147,11 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
                 .leftJoin(PbSemesterConfig.class, PbSemesterConfig::getBeltcode, PbVXsxxsfytb::getBeltcode)
                 .leftJoin(BaseSemester.class, BaseSemester::getId, PbSemesterConfig::getBaseSemesterId)
-                .selectAs(BaseSemester::getId, PbVXsxxsfytbPageVo::getBaseSemester)
-                .selectAs(XjrUser::getId, PbVXsxxsfytbPageVo::getUserId)
-                .selectAs(BaseSemester::getName, PbVXsxxsfytbPageVo::getBaseSemesterCn)
+                .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
+                .selectAs(BaseClass::getName, PbVXsxxsfytbExcelVo::getClassname)
+                .selectAs(BaseSemester::getId, PbVXsxxsfytbExcelVo::getBaseSemester)
+                .selectAs(XjrUser::getId, PbVXsxxsfytbExcelVo::getUserId)
+                .selectAs(BaseSemester::getName, PbVXsxxsfytbExcelVo::getBaseSemesterCn)
                 .select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbExcelVo.class).contains(x.getProperty()))
         ;
 

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

@@ -46,11 +46,11 @@ public class PbVXsxxsfytbExcelVo {
     @ApiModelProperty("电话")
     private String telephone;
     /**
-    * 姓名
+    * 性别
     */
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("姓名")
-    @ApiModelProperty("姓名")
+    @ExcelProperty("性别")
+    @ApiModelProperty("性别")
     private String sex;
     /**
     * 收费标准金额
@@ -138,11 +138,11 @@ public class PbVXsxxsfytbExcelVo {
     @ApiModelProperty("学期Id")
     private String baseSemester;
     /**
-     * 学期Id
+     * 学期
      */
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("学期Id")
-    @ApiModelProperty("学期Id")
+    @ExcelProperty("学期")
+    @ApiModelProperty("学期")
     private String baseSemesterCn;
     /**
      * 学生Id