1、课酬确认相关

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherSalaryComplaintsDao.java

@@ -38,4 +38,13 @@ public interface TeacherSalaryComplaintsDao extends BaseDAO<Long, TeacherSalaryC
                                                                        @Param("month") String month,
                                                                         @Param("status") TeacherSalaryComplaintsStatusEnum status);
 
+    /**
+     * @describe 根据月份更新未处理的申诉至已结束
+     * @author Joburgess
+     * @date 2020/4/18
+     * @param month:
+     * @return int
+     */
+    int updateComplaintStatusTuDoneWithMonth(@Param("month") String month);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -957,5 +957,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatusToComplied(teacherSalaryIds);
+        teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month);
     }
 }

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

@@ -140,7 +140,7 @@
 			sees.monday_ >= #{monday}
 			AND sees.sunday_ <= #{sunday}
 			<if test="search!=null">
-				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%') OR tea.username_ LIKE CONCAT('%', #{search}, '%'))
+				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%') OR tea.real_name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 			<if test="organIdList != null">
 				AND FIND_IN_SET(stu.organ_id_,#{organIdList})
@@ -191,7 +191,7 @@
 			sees.monday_ &gt;= #{monday}
 			AND sees.sunday_ &lt;= #{sunday}
 			<if test="search!=null">
-				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%') OR tea.username_ LIKE CONCAT('%', #{search}, '%'))
+				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%') OR tea.real_name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 			<if test="organIdList != null">
 				AND FIND_IN_SET(stu.organ_id_, #{organIdList})

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

@@ -61,7 +61,13 @@
 		AND tsc.status_ = 'PENDING'
 	</update>
 
-	<!-- 根据主键查询一条记录 -->
+    <update id="updateComplaintStatusTuDoneWithMonth">
+		UPDATE teacher_salary_complaints tsc SET tsc.status_ = 'DONE'
+		WHERE tsc.salary_settlement_month_ = #{salarySettlementMonth}
+		AND tsc.status_ = 'PENDING'
+	</update>
+
+    <!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="TeacherSalaryComplaints">
 		SELECT * FROM teacher_salary_complaints WHERE id_ = #{id}
 	</select>