Browse Source

feat:课酬到处增加扣款原因

Joburgess 4 years ago
parent
commit
7e78d4e807

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

@@ -61,6 +61,16 @@ public class TeacherCourseSalaryDetail4WebDto {
 
     private String memo;
 
+    private String deductionReason;
+
+    public String getDeductionReason() {
+        return deductionReason;
+    }
+
+    public void setDeductionReason(String deductionReason) {
+        this.deductionReason = deductionReason;
+    }
+
     public BigDecimal getActualReceipts() {
         return actualReceipts;
     }

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -787,6 +787,7 @@
 		<result property="reduceSalary" column="reduce_salary" />
 		<result property="confirmStatus" column="confirm_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result property="memo" column="memo_" />
+		<result property="deductionReason" column="deduction_reason_" />
 	</resultMap>
 
 	<sql id="queryCourseSalaryCondition">
@@ -853,7 +854,8 @@
 			csts.actual_salary_,
 			csts.reduce_salary,
 			csts.confirm_status_,
-			csts.memo_
+			csts.memo_,
+			csts.deduction_reason_
 		FROM
 			course_schedule_teacher_salary csts
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_

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

@@ -1690,9 +1690,10 @@ public class ExportController extends BaseController {
         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"}, rows);
+                            "signInStatusStr", "signOutStatusStr", "actualReceipts", "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();