Merge remote-tracking branch 'origin/master'

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

@@ -445,7 +445,8 @@
 	</update>
 
     <update id="updateSalary" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog">
-		UPDATE course_schedule_teacher_salary SET actual_salary_ = #{modifyLog.currentExpectSalary},reduce_salary = #{modifyLog.currentReduceSalary},update_time_ = NOW()
+		UPDATE course_schedule_teacher_salary SET actual_salary_ = #{modifyLog.currentExpectSalary},
+		reduce_salary = #{modifyLog.currentReduceSalary},update_time_ = NOW(),memo_ = #{modifyLog.memo}
 		WHERE course_schedule_id_ = #{modifyLog.courseScheduleId} AND user_id_ = #{modifyLog.teacherId}
 	</update>
 	<update id="updateTeacherSalaryConfirmStatus">

mec-biz/src/main/resources/config/mybatis/TeacherSalaryComplaintsMapper.xml

@@ -96,8 +96,8 @@
 			<if test="organId != null">
 				t.organ_id_ = #{organId}
 			</if>
-			<if test="salarySettlementMonth != null">
-				AND tsc.salary_settlement_month_ &lt;= #{salarySettlementMonth}
+			<if test="salarySettlementMonth != null and salarySettlementMonth != ''">
+				AND tsc.salary_settlement_month_ = #{salarySettlementMonth}
 			</if>
 			<if test="teacherId != null">
 				AND tsc.teacher_id_ = #{teacherId}

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

@@ -90,9 +90,9 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "老师ID", "老师姓名", "课酬归属时间", "申述提交时间", "状态",
-                    "申述处理者", "备注"}, new String[]{
+                    "申述处理者"}, new String[]{
                     "organName", "teacherId", "realName", "salarySettlementMonth", "createTime", "statusEnum.msg",
-                    "operatorRealName", "memo"}, rows);
+                    "operatorRealName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();