1、课酬确认相关

2、VIP课导出添加学生姓名和编号

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherCourseSalaryDetail4WebDto.java

@@ -36,11 +36,13 @@ public class TeacherCourseSalaryDetail4WebDto {
     private java.util.Date signInTime;
 
     private YesOrNoEnum signInStatus;
-
-    private YesOrNoEnum signOutStatus;
+    private String signInStatusStr;
 
     private Date signOutTime;
 
+    private YesOrNoEnum signOutStatus;
+    private String signOutStatusStr;
+
     private java.math.BigDecimal expectSalary;
 
     private java.math.BigDecimal actualSalary;
@@ -53,6 +55,22 @@ public class TeacherCourseSalaryDetail4WebDto {
 
     private String memo;
 
+    public String getSignInStatusStr() {
+        return signInStatusStr;
+    }
+
+    public void setSignInStatusStr(String signInStatusStr) {
+        this.signInStatusStr = signInStatusStr;
+    }
+
+    public String getSignOutStatusStr() {
+        return signOutStatusStr;
+    }
+
+    public void setSignOutStatusStr(String signOutStatusStr) {
+        this.signOutStatusStr = signOutStatusStr;
+    }
+
     public BigDecimal getFinalSalary() {
         return finalSalary;
     }

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

@@ -5,10 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
@@ -1183,13 +1180,35 @@ public class ExportController extends BaseController {
             response.flushBuffer();
             return;
         }
+        for (TeacherCourseSalaryDetail4WebDto row : rows) {
+            if(Objects.isNull(row.getSignInTime())){
+                row.setSignInStatusStr("未签到");
+            }else{
+                String signInTimeStr = DateUtil.dateToString(row.getSignInTime(), "yyyy-MM-dd HH:mm");
+                if(YesOrNoEnum.YES.equals(row.getSignInStatus())){
+                    row.setSignInStatusStr(signInTimeStr+"(正常签到)");
+                }else{
+                    row.setSignInStatusStr(signInTimeStr+"(异常签到)");
+                }
+            }
+            if(Objects.isNull(row.getSignOutTime())){
+                row.setSignOutStatusStr("未签退");
+            }else{
+                String signOutTimeStr = DateUtil.dateToString(row.getSignOutTime(), "yyyy-MM-dd HH:mm");
+                if(YesOrNoEnum.YES.equals(row.getSignOutStatus())){
+                    row.setSignOutStatusStr(signOutTimeStr+"(正常签退)");
+                }else{
+                    row.setSignOutStatusStr(signOutTimeStr+"(异常签退)");
+                }
+            }
+        }
         OutputStream ouputStream = null;
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(
                     new String[]{"分部", "课程组类型", "课程编号", "时间", "课程名称", "老师编号", "老师姓名", "签到时间", "签退时间", "应发课酬",
-                                 "课酬扣款", "结算课酬", "结算课酬", "状态", "备注"},
-                    new String[]{"organName", "groupType", "courseScheduleId", "startClassTime", "courseName", "teacherId", "teacherName",
-                                "signInTime", "signOutTime", "actualSalary", "reduceSalary", "finalSalary", "confirmStatus", "memo"}, rows);
+                                 "课酬扣款", "结算课酬", "状态", "备注"},
+                    new String[]{"organName", "groupType.desc", "courseScheduleId", "startClassTime", "courseName", "teacherId", "teacherName",
+                                "signInStatusStr", "signOutStatusStr", "actualSalary", "reduceSalary", "finalSalary", "confirmStatus.desc", "memo"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();