Browse Source

Merge remote-tracking branch 'origin/master'

Joburgess 4 năm trước cách đây
mục cha
commit
a03fd6d81a

+ 2 - 11
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1230,15 +1230,6 @@ public class ExportController extends BaseController {
                         row.setGender("女");
                     }
                 }
-                /*if (row.getPaymentStatus() != null) {
-                    if (row.getPaymentStatus().equals("PAID_COMPLETED")) {
-                        row.setPaymentStatus("完成缴费");
-                    } else if (row.getPaymentStatus().equals("NON_PAYMENT")) {
-                        row.setPaymentStatus("未缴费");
-                    } else if (row.getPaymentStatus().equals("PROCESSING")) {
-                        row.setPaymentStatus("缴费中");
-                    }
-                }*/
                 if (row.getStudentStatus().equals("NORMAL")) {
                     row.setStudentStatus("在读");
                 } else {
@@ -1259,9 +1250,9 @@ public class ExportController extends BaseController {
                 }
             }
             String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级", "班级", "专业", "学员状态", "新增学员", "缴费金额",
-                    "下次缴费日期", "是否报名缴费", "是否激活"};
+                        "下次缴费日期", "是否报名缴费", "是否激活", "欠费总额"};
             String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "currentClass", "subjectName", "studentStatus", "isNewStudentStr",
-                    "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName"};
+                    "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName","noPaymentAmount"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");