Merge branch 'zx_saas_sql' of http://git.dayaedu.com/yonge/mec into test

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

@@ -2089,7 +2089,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     CourseSchedule findByRoomUid(@Param("roomUid") String roomUid, @Param("type") GroupType type);
 
-    List<ExportCourseIncomeDto> exportCourseIncome(@Param("month") String month);
+    List<ExportCourseIncomeDto> exportCourseIncome(@Param("cutFirstDayOfMonth") String cutFirstDayOfMonth, @Param("cutLastDayOfMonth") String cutLastDayOfMonth);
 
     List<CourseSchedule> getNotStartOnlineNoLive(@Param("beforeTime") Integer beforeTime, @Param("tenantInfoId") Integer tenantInfoId);
 

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

@@ -6209,7 +6209,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
     @Override
     public List<ExportCourseIncomeDto> exportCourseIncome(String month) {
-        return courseScheduleDao.exportCourseIncome(month);
+		String cutFirstDayOfMonth = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(DateUtil.stringToDate(month,DateUtil.ISO_YEAR_MONTH_FORMAT)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+		String cutLastDayOfMonth = DateUtil.dateToString(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(month,DateUtil.ISO_YEAR_MONTH_FORMAT)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+		return courseScheduleDao.exportCourseIncome(cutFirstDayOfMonth,cutLastDayOfMonth);
     }
 
     @Override

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

@@ -4488,7 +4488,7 @@
         select o.name_ organName,cs.id_ courseId,SUM(cssp.actual_price_) amount from course_schedule cs
         left join course_schedule_student_payment cssp ON cs.id_ = cssp.course_schedule_id_
         left join organization o ON o.id_ = cs.organ_id_
-        where DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cssp.actual_price_ > 0
+        where cs.class_date_ BETWEEN #{cutFirstDayOfMonth} AND #{cutLastDayOfMonth} AND cssp.actual_price_ > 0
           AND cs.del_flag_ = '0' AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1
           AND cs.tenant_id_ = 1
         group by cs.id_ order by cs.organ_id_;

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

@@ -1024,7 +1024,8 @@
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-		WHERE cs.pre_course_flag_ != 1 AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime}
+		WHERE cs.pre_course_flag_ = 0 AND cs.del_flag_ = '0'
+		AND cs.class_date_ BETWEEN #{startTime} AND CURDATE()
 		AND (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)) AND cssp.id_ IS NOT NULL
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
 		AND cs.merge_flag_ IN (0,1)
@@ -1053,7 +1054,7 @@
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime} AND cs.pre_course_flag_ != 1
+		AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE() AND cs.pre_course_flag_ = 0
 		AND (((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
 		AND (ta.sign_out_status_ IS NOT NULL OR ta.sign_in_status_ IS NOT NULL)
 		AND cs.merge_flag_ IN (0,1) AND cssp.id_ IS NOT NULL
@@ -1077,7 +1078,7 @@
 		SELECT COUNT(DISTINCT cs.id_) FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ != 1
+		AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE() AND cs.pre_course_flag_ = 0
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.complaints_content_ IS NULL AND ta.dispose_content_ IS NULL
 		AND cs.merge_flag_ IN (0,1)
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
@@ -1102,7 +1103,7 @@
 		FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ != 1
+		AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE() AND cs.pre_course_flag_ = 0
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 		AND cs.merge_flag_ IN (0,1)
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)

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

@@ -1021,10 +1021,10 @@
         </foreach>
     </update>
     <update id="cleanStudentMember">
-        UPDATE student SET member_rank_setting_id_ = NULL WHERE NOW() > membership_end_time_
+        UPDATE student SET member_rank_setting_id_ = NULL WHERE NOW() > membership_end_time_ AND member_rank_setting_id_ IS NOT NULL
     </update>
     <update id="cleanExperienceStudentMember">
-        UPDATE student SET experience_member_rank_setting_id_ = NULL WHERE NOW() > experience_membership_end_time_
+        UPDATE student SET experience_member_rank_setting_id_ = NULL WHERE NOW() > experience_membership_end_time_ AND experience_member_rank_setting_id_ IS NOT NULL
     </update>
     <update id="cleanMember">
         UPDATE student SET member_rank_setting_id_ = NULL,membership_start_time_ = NULL,membership_end_time_ = NULL