feat:教师端课酬

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

@@ -552,7 +552,9 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @param year:
 	 * @return java.util.List<java.util.Map<java.lang.String,java.math.BigDecimal>>
 	 */
-	List<Map<String, BigDecimal>> teacherIncomeStat(@Param("teacherId") Integer teacherId, @Param("year") Integer year);
+	List<Map<String, BigDecimal>> teacherIncomeStat(@Param("teacherId") Integer teacherId,
+													@Param("year") Integer year,
+													@Param("month") Integer month);
 
 	/**
 	 * @describe 获取今日有课教师编号

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleTeacherSalaryService.java

@@ -273,7 +273,7 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @param year:
      * @return java.util.Map<java.lang.String,java.math.BigDecimal>
      */
-    Map<String, BigDecimal> teacherIncomeStat(Integer teacherId, Integer year);
+    Map<String, BigDecimal> teacherIncomeStat(Integer teacherId, Integer year, Integer month);
 
     /**
      * @describe 推送查看今日收入提醒

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

@@ -2066,8 +2066,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     }
 
     @Override
-    public Map<String, BigDecimal> teacherIncomeStat(Integer teacherId, Integer year) {
-        List<Map<String, BigDecimal>> monthIncomeMapList = courseScheduleTeacherSalaryDao.teacherIncomeStat(teacherId, year);
+    public Map<String, BigDecimal> teacherIncomeStat(Integer teacherId, Integer year, Integer month) {
+        List<Map<String, BigDecimal>> monthIncomeMapList = courseScheduleTeacherSalaryDao.teacherIncomeStat(teacherId, year, month);
         Map<String, BigDecimal> monthIncomeMap = MapUtil.convertIntegerMap(monthIncomeMapList);
         LocalDate now = LocalDate.now();
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM");

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

@@ -1100,10 +1100,15 @@
 				LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 		WHERE
 			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-		  AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
-		  AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
-		  AND csts.user_id_ = #{teacherId}
-		  AND YEAR ( cs.class_date_ ) = #{year}
+			AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
+			AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
+			AND csts.user_id_ = #{teacherId}
+			<if test="year!=null">
+				AND YEAR ( cs.class_date_ ) = #{year}
+			</if>
+			<if test="month!=null">
+				AND MONTH(cs.class_date_) = #{month}
+			</if>
 		  AND csts.settlement_time_ IS NOT NULL
 		GROUP BY MONTH(cs.class_date_)
 	</select>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseScheduleTeacherSalaryController.java

@@ -100,12 +100,12 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
 
     @ApiOperation(value = "收入统计")
     @GetMapping("/teacherIncomeStat")
-    public HttpResponseResult teacherIncomeStat(Integer year){
+    public HttpResponseResult teacherIncomeStat(Integer year, Integer month){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(courseScheduleTeacherSalaryService.teacherIncomeStat(sysUser.getId(), year));
+        return succeed(courseScheduleTeacherSalaryService.teacherIncomeStat(sysUser.getId(), year, month));
     }
 
 }