feat:1、课酬标记

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

@@ -65,6 +65,16 @@ public class TeacherCourseSalaryDetail4WebDto {
 
     private Integer belongDaya;
 
+    private String salaryType;
+
+    public String getSalaryType() {
+        return salaryType;
+    }
+
+    public void setSalaryType(String salaryType) {
+        this.salaryType = salaryType;
+    }
+
     public Integer getBelongDaya() {
         return belongDaya;
     }

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

@@ -1686,15 +1686,20 @@ public class ExportController extends BaseController {
                     row.setSignOutStatusStr(signOutTimeStr + "(异常签退)");
                 }
             }
+            if(row.getBelongDaya()==1){
+                row.setSalaryType("基本课酬");
+            }else{
+                row.setSalaryType("其它课酬");
+            }
         }
         OutputStream ouputStream = null;
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(
                     new String[]{"分部", "课程组类型", "课程编号", "时间", "课程名称", "老师编号", "老师姓名", "签到时间", "签退时间",
-                            "学员缴费", "应发课酬", "课酬扣款", "结算课酬", "状态", "备注", "扣款原因"},
+                            "学员缴费", "课酬类型", "应发课酬", "课酬扣款", "结算课酬", "状态", "备注", "扣款原因"},
                     new String[]{"organName", "groupType.desc", "courseScheduleId", "startClassTime", "courseName", "teacherId", "teacherName",
-                            "signInStatusStr", "signOutStatusStr", "actualReceipts", "actualSalary", "reduceSalary", "finalSalary", "confirmStatus.desc",
-                            "memo", "deductionReason"}, rows);
+                            "signInStatusStr", "signOutStatusStr", "actualReceipts", "salaryType", "actualSalary", "reduceSalary", "finalSalary",
+                            "confirmStatus.desc", "memo", "deductionReason"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();