Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ArrearageStudentsQueryInfo.java

@@ -23,4 +23,28 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
     public void setOrganIds(String organIds) {
         this.organIds = organIds;
     }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public Integer getEduTeacherId() {
+        return eduTeacherId;
+    }
+
+    public void setEduTeacherId(Integer eduTeacherId) {
+        this.eduTeacherId = eduTeacherId;
+    }
 }

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

@@ -673,6 +673,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             boolean signInInRange = false;
             boolean signOutInRange = false;
             if(Objects.nonNull(school)&&Objects.nonNull(school.getLongitudeLatitude())
+                    &&Objects.nonNull(teacherAttendance)
                     &&StringUtils.isNotBlank(teacherAttendance.getSignInLongitudeLatitude())
                     &&StringUtils.isNotBlank(teacherAttendance.getSignOutLongitudeLatitude())){
                 double signInDistance = MapUtil.distance(teacherAttendance.getSignInLongitudeLatitude(),

mec-biz/src/main/resources/config/contracts/product.ftl

@@ -31,8 +31,9 @@
             font-size: 14px;
         }
         h1 {
-            font-size: 16px;
+            font-size: 18px;
             text-align: center;
+            margin-bottom: 8px;
         }
         h2 {
             font-size: 16px;

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

@@ -639,9 +639,13 @@
         class_group cg
         LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
         LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
+        LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
         WHERE
         cg.type_ IN ('HIGH', 'HIGH_ONLINE')
         AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
+        AND cs.del_flag_=0
+        AND cs.status_='NOT_START'
+        AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
         <if test="organIds!=null and organIds!=''">
             AND FIND_IN_SET(mg.organ_id_, #{organIds})
         </if>

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

@@ -472,9 +472,13 @@
 		class_group cg
 		LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 		LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
+		LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
 		WHERE
 		cg.type_ IN ('HIGH', 'HIGH_ONLINE')
 		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
+		AND cs.del_flag_=0
+		AND cs.status_='NOT_START'
+		AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
 		<if test="organIds!=null and organIds.size()>0">
 			AND mg.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">

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

@@ -437,7 +437,7 @@
 				AND mgpc.music_group_id_ = #{musicGroupId}
 			</if>
 			<if test="cooperationOrganId!=null">
-				AND mg.school_id_ = #{cooperationOrganId}
+				AND mg.cooperation_organ_id_ = #{cooperationOrganId}
 			</if>
 			<if test="eduTeacherId!=null">
 				AND mg.educational_teacher_id_=#{eduTeacherId}
@@ -472,7 +472,7 @@
 			LEFT JOIN sys_user edu ON edu.id_ = mg.educational_teacher_id_
 			LEFT JOIN organization organ ON organ.id_ = mg.organ_id_
 			LEFT JOIN `subject` sub ON sr.actual_subject_id_ = sub.id_
-			LEFT JOIN cooperation_organ co ON mg.school_id_ = co.id_
+			LEFT JOIN cooperation_organ co ON mg.cooperation_organ_id_ = co.id_
 		<include refid="queryArrearageStudentsCondition"/>
 		GROUP BY
 			mgpc.music_group_id_,mgpcd.user_id_

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

@@ -21,7 +21,7 @@
         <result column="remark_" property="remark"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="is_replied_timely_" property="isRepliedTimely" />
+        <result column="is_replied_timely_" property="isRepliedTimely"/>
         <result column="is_view_" property="isView" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="submit_time_" property="submitTime"/>
     </resultMap>
@@ -50,13 +50,17 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentCourseHomework">
-		SELECT * FROM student_course_homework WHERE id_ = #{id}
-	</select>
+        SELECT *
+        FROM student_course_homework
+        WHERE id_ = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentCourseHomework">
-		SELECT * FROM student_course_homework ORDER BY id_
-	</select>
+        SELECT *
+        FROM student_course_homework
+        ORDER BY id_
+    </select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentCourseHomework" useGeneratedKeys="true"
@@ -128,8 +132,10 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM student_course_homework WHERE id_ = #{id}
-	</delete>
+        DELETE
+        FROM student_course_homework
+        WHERE id_ = #{id}
+    </delete>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseHomeworkListDto" id="CourseHomeworkDto">
         <result column="id_" property="id"/>
@@ -174,21 +180,21 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="CourseHomeworkDto" parameterType="map">
         SELECT
-            sch.id_,
-            ch.*,
-            IF(cs.group_type_='MUSIC',mg.name_,NULL) music_group_name_,
-            cg.name_ class_group_name_,
-            CONCAT( class_date_, ' ', start_class_time_ ) start_class_time_,
-            ch.expiry_date_,
-            sch.remark_,
-            sch.status_,
-            sch.is_replied_
+        sch.id_,
+        ch.*,
+        IF(cs.group_type_='MUSIC',mg.name_,NULL) music_group_name_,
+        cg.name_ class_group_name_,
+        CONCAT( class_date_, ' ', start_class_time_ ) start_class_time_,
+        ch.expiry_date_,
+        sch.remark_,
+        sch.status_,
+        sch.is_replied_
         FROM student_course_homework sch
-            LEFT JOIN course_homework ch ON sch.course_homework_id_=ch.id_
-            LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
-            LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
-            LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-            <include refid="queryCondition"/>
+        LEFT JOIN course_homework ch ON sch.course_homework_id_=ch.id_
+        LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
+        LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
+        LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
+        <include refid="queryCondition"/>
         ORDER BY CONCAT( class_date_, ' ', start_class_time_ ) DESC
         <include refid="global.limit"/>
     </select>
@@ -203,86 +209,83 @@
         <include refid="queryCondition"/>
     </select>
     <select id="findCourseHomeworkStudentDetail" resultMap="CourseHomeworkStudentDetailDto">
-		SELECT
-			mg.name_ musicGroupName,
-			cg.name_ classGroupName,
-			ch.id_ courseHomeworkId,
-			ch.content_,
-			ch.expiry_date_,
-			ch.completed_num_,
-			ch.expect_num_,
-			ch.expiry_date_,
-			sch.id_ studentCourseHomeworkId,
-			sch.attachments_,
-			sch.score_,
-			sch.status_,
-			sch.is_replied_,
-			sch.course_schedule_id_
-		FROM
-			course_homework ch
-		LEFT JOIN student_course_homework sch ON ch.id_=sch.course_homework_id_
-		LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
-		LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-		WHERE ch.course_schedule_id_=#{courseScheduleID} AND sch.user_id_=#{userID}
-	</select>
+        SELECT mg.name_ musicGroupName,
+               cg.name_ classGroupName,
+               ch.id_   courseHomeworkId,
+               ch.content_,
+               ch.expiry_date_,
+               ch.completed_num_,
+               ch.expect_num_,
+               ch.expiry_date_,
+               sch.id_  studentCourseHomeworkId,
+               sch.attachments_,
+               sch.score_,
+               sch.status_,
+               sch.is_replied_,
+               sch.course_schedule_id_
+        FROM course_homework ch
+                 LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
+                 LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
+                 LEFT JOIN class_group cg ON ch.class_group_id_ = cg.id_
+        WHERE ch.course_schedule_id_ = #{courseScheduleID}
+          AND sch.user_id_ = #{userID}
+    </select>
     <select id="constructInitialStudentHomeworkRecords" resultMap="StudentCourseHomework">
-		SELECT
-			#{courseHomeworkID} course_homework_id_,
-			sa.user_id_,
-			0 status_,
-			0 is_replied_
-		FROM
-			student_attendance sa
-		WHERE
-			sa.course_schedule_id_ = #{courseScheduleID}
-			AND status_ = "NORMAL"
-	</select>
-	<select id="constructInitialStudentHomeworkRecordsWithPayment" resultMap="StudentCourseHomework">
-		SELECT
-			#{courseHomeworkID} course_homework_id_,
-			#{courseScheduleID} course_schedule_id_,
-			sa.user_id_,
-			0 status_,
-			0 is_replied_,
-			0 is_replied_timely_
-		FROM
-			course_schedule_student_payment sa
-		WHERE
-			sa.course_schedule_id_ = #{courseScheduleID}
-	</select>
-	<select id="findByCourseSchedule" resultMap="StudentCourseHomework">
-		SELECT
-			sch.*,
-			su.username_,
-			su.avatar_
-		FROM
-			student_course_homework sch
-			LEFT JOIN sys_user su ON sch.user_id_=su.id_
-			<where>
-				sch.course_schedule_id_=#{courseScheduleId}
-				<if test="userName!=null and userName!=''">
-					AND su.username_ LIKE CONCAT('%',#{userName},'%')
-				</if>
-			</where>
-	</select>
-	<select id="findByStudentAndCourseHomewok" resultMap="StudentCourseHomework">
-		SELECT * FROM student_course_homework WHERE user_id_=#{userId} AND course_homework_id_=#{courseHomeworkId}
-	</select>
-
-    <select id="queryNotDoneHomeworkList" resultMap="StudentCourseHomeworkFull">
+        SELECT #{courseHomeworkID} course_homework_id_,
+               sa.user_id_,
+               0                   status_,
+               0                   is_replied_
+        FROM student_attendance sa
+        WHERE sa.course_schedule_id_ = #{courseScheduleID}
+          AND status_ = "NORMAL"
+    </select>
+    <select id="constructInitialStudentHomeworkRecordsWithPayment" resultMap="StudentCourseHomework">
+        SELECT #{courseHomeworkID} course_homework_id_,
+               #{courseScheduleID} course_schedule_id_,
+               sa.user_id_,
+               0                   status_,
+               0                   is_replied_,
+               0                   is_replied_timely_
+        FROM course_schedule_student_payment sa
+        WHERE sa.course_schedule_id_ = #{courseScheduleID}
+    </select>
+    <select id="findByCourseSchedule" resultMap="StudentCourseHomework">
         SELECT
-        sch.*, cg.name_ classGroupName,
-        mg.name_ musicGroupName
+        sch.*,
+        su.username_,
+        su.avatar_
         FROM
         student_course_homework sch
-        LEFT JOIN course_homework ch ON sch.course_homework_id_ = ch.id_
-        LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
-        LEFT JOIN class_group cg ON ch.class_group_id_ = cg.id_
-        WHERE
-        sch.status_ = 0 AND datediff(NOW(),sch.create_time_) &lt; 8
-	</select>
+        LEFT JOIN sys_user su ON sch.user_id_=su.id_
+        <where>
+            sch.course_schedule_id_=#{courseScheduleId}
+            <if test="userName!=null and userName!=''">
+                AND su.username_ LIKE CONCAT('%',#{userName},'%')
+            </if>
+        </where>
+    </select>
+    <select id="findByStudentAndCourseHomewok" resultMap="StudentCourseHomework">
+        SELECT *
+        FROM student_course_homework
+        WHERE user_id_ = #{userId}
+          AND course_homework_id_ = #{courseHomeworkId}
+    </select>
+
+    <select id="queryNotDoneHomeworkList" resultMap="StudentCourseHomeworkFull">
+        SELECT sch.*,
+               cg.name_ classGroupName,
+               mg.name_ musicGroupName
+        FROM student_course_homework sch
+                 LEFT JOIN course_homework ch ON sch.course_homework_id_ = ch.id_
+                 LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
+                 LEFT JOIN class_group cg ON ch.class_group_id_ = cg.id_
+        WHERE sch.status_ = 0
+          AND datediff(NOW(), sch.create_time_) &lt; 8
+    </select>
     <select id="countStudentCourseHomeworks" resultType="java.lang.Integer">
-        SELECT COUNT(id_) FROM course_schedule_student_payment WHERE course_schedule_id_ = #{search}
+        SELECT COUNT(id_)
+        FROM course_schedule_student_payment
+        WHERE course_schedule_id_ = #{search}
     </select>
     <resultMap id="StudentCourseHomeworkDtoMap" type="com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto">
         <result column="student_course_homework_id_" property="studentCourseHomeworkId"/>
@@ -299,7 +302,8 @@
         SELECT sch.id_ student_course_homework_id_,sch.attachments_,sch.is_replied_,sch.is_view_,
         sch.update_time_,cssp.user_id_,su.username_,su.phone_,s.name_ subject_name_
         FROM course_schedule_student_payment cssp
-        LEFT JOIN student_course_homework sch ON sch.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sch.user_id_ AND sch.status_ = 1
+        LEFT JOIN student_course_homework sch ON sch.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ =
+        sch.user_id_ AND sch.status_ = 1
         LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
         LEFT JOIN student_registration sr ON cssp.music_group_id_ = sr.music_group_id_ AND cssp.user_id_ = sr.user_id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
@@ -318,28 +322,26 @@
     </resultMap>
     <select id="findStudentHomeworkRecord" resultMap="StudentHomeworkRecordDto">
         SELECT
-            sch.id_ student_course_homework_id_,
-            sch.course_schedule_id_,
-            cs.name_ course_name_,
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-            cs.actual_teacher_id_,
-            sch.status_
+        sch.id_ student_course_homework_id_,
+        sch.course_schedule_id_,
+        cs.name_ course_name_,
+        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+        cs.actual_teacher_id_,
+        sch.status_
         FROM
-            student_course_homework sch
-            LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
+        student_course_homework sch
+        LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
         WHERE sch.user_id_=#{userId}
         AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
         ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_) DESC
         <include refid="global.limit"/>
     </select>
     <select id="countStudentHomeworkRecord" resultType="int">
-        SELECT
-            COUNT(sch.id_)
-        FROM
-            student_course_homework sch
-            LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
-        WHERE sch.user_id_=#{userId}
-        AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
+        SELECT COUNT(sch.id_)
+        FROM student_course_homework sch
+                 LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
+        WHERE sch.user_id_ = #{userId}
+          AND DATE_FORMAT(class_date_, '%Y-%m') = DATE_FORMAT(#{classDate}, '%Y-%m')
     </select>
     <select id="findByCourses" resultMap="StudentCourseHomework">
         SELECT * FROM student_course_homework WHERE course_schedule_id_ IN
@@ -348,38 +350,39 @@
         </foreach>
     </select>
 
-    <resultMap id="StudentServeCourseHomeworkDto" type="com.ym.mec.biz.dal.dto.StudentServeCourseHomeworkDto" extends="StudentCourseHomework">
+    <resultMap id="StudentServeCourseHomeworkDto" type="com.ym.mec.biz.dal.dto.StudentServeCourseHomeworkDto"
+               extends="StudentCourseHomework">
         <result property="courseStartTime" column="course_start_time_"/>
         <result property="homeworkCreateTime" column="homework_create_time_"/>
     </resultMap>
     <select id="findStudentHomeworkWithCourseDateRange" resultMap="StudentServeCourseHomeworkDto">
         SELECT
-            sch.*,
-            DATE_FORMAT(sch.create_time_, '%Y-%m-%d') homework_create_time_,
-            cs.class_date_ course_start_time_
+        sch.*,
+        DATE_FORMAT(sch.create_time_, '%Y-%m-%d') homework_create_time_,
+        cs.class_date_ course_start_time_
         FROM
-            student_course_homework sch
-            LEFT JOIN course_schedule cs ON sch.course_schedule_id_ = cs.id_
+        student_course_homework sch
+        LEFT JOIN course_schedule cs ON sch.course_schedule_id_ = cs.id_
         WHERE
-            cs.class_date_ BETWEEN #{startDate} AND #{endDate}
-            AND sch.user_id_ IN
-            <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
-                #{studentId}
-            </foreach>
+        cs.class_date_ BETWEEN #{startDate} AND #{endDate}
+        AND sch.user_id_ IN
+        <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
+            #{studentId}
+        </foreach>
     </select>
     <select id="checkStudentHaveHomeworkInDateRange" resultType="java.lang.Integer">
         SELECT
-            DISTINCT sch.user_id_
+        DISTINCT sch.user_id_
         FROM
-            student_course_homework sch
-            LEFT JOIN course_schedule cs ON sch.course_schedule_id_ = cs.id_
+        student_course_homework sch
+        LEFT JOIN course_schedule cs ON sch.course_schedule_id_ = cs.id_
         WHERE
-            cs.class_date_ BETWEEN #{startDate}
-            AND #{endDate}
-            AND sch.user_id_ IN
-            <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
-                #{studentId}
-            </foreach>
+        cs.class_date_ BETWEEN #{startDate}
+        AND #{endDate}
+        AND sch.user_id_ IN
+        <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
+            #{studentId}
+        </foreach>
     </select>
     <select id="queryReplied" resultType="java.util.Map">
         SELECT sch.course_homework_id_ AS 'key',COUNT(0) AS 'value'
@@ -395,35 +398,37 @@
     <sql id="queryAllCondition">
         <where>
             <if test="courseScheduleId!=null">
-               AND course_schedule_id_=#{courseScheduleId}
+                AND course_schedule_id_=#{courseScheduleId}
             </if>
             <if test="isReplied!=null">
-               AND is_replied_=#{isReplied}
+                AND is_replied_=#{isReplied}
             </if>
         </where>
     </sql>
 
     <select id="queryAll" resultMap="StudentCourseHomework">
-         SELECT * FROM student_course_homework
-         <include refid="queryAllCondition" />
-         ORDER BY id_
-         <include refid="global.limit"></include>
+        SELECT * FROM student_course_homework
+        <include refid="queryAllCondition"/>
+        ORDER BY id_
+        <include refid="global.limit"></include>
     </select>
     <select id="countAll" resultType="int">
         SELECT COUNT(*) FROM student_course_homework
-        <include refid="queryAllCondition" />
+        <include refid="queryAllCondition"/>
     </select>
 
     <delete id="delByCourseScheduleId">
-		DELETE FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId}
-	</delete>
+        DELETE
+        FROM student_course_homework
+        WHERE course_schedule_id_ = #{courseScheduleId}
+    </delete>
 
     <delete id="batchDelByCourseScheduleId">
-		DELETE FROM student_course_homework WHERE course_schedule_id_ IN
-		<foreach collection="courseScheduleIdList" item="courseScheduleId" open="(" close=")" separator=",">
-			#{courseScheduleId}
-		</foreach>
-	</delete>
+        DELETE FROM student_course_homework WHERE course_schedule_id_ IN
+        <foreach collection="courseScheduleIdList" item="courseScheduleId" open="(" close=")" separator=",">
+            #{courseScheduleId}
+        </foreach>
+    </delete>
 
     <resultMap id="StudentVisitCourseHomeWorkDto" type="com.ym.mec.biz.dal.dto.StudentVisitCourseHomeWorkDto">
         <result column="groupType" property="groupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -438,15 +443,15 @@
     </resultMap>
     <select id="getStudentCourseHomeWorks" resultMap="StudentVisitCourseHomeWorkDto">
         SELECT sch.course_schedule_id_ courseScheduleId,
-        cs.group_type_          groupType,
-        cs.music_group_id_      groupId,
-        cs.name_                courseName,
-        sch.create_time_        createTime,
-        t.real_name_            teacherName,
-        ch.content_             content,
-        sch.status_             status,
-        sch.is_replied_         isReplied,
-        sch.is_view_            isView
+        cs.group_type_ groupType,
+        cs.music_group_id_ groupId,
+        cs.name_ courseName,
+        sch.create_time_ createTime,
+        t.real_name_ teacherName,
+        ch.content_ content,
+        sch.status_ status,
+        sch.is_replied_ isReplied,
+        sch.is_view_ isView
         FROM student_course_homework sch
         LEFT JOIN course_homework ch ON ch.id_ = sch.course_homework_id_
         LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
@@ -475,8 +480,8 @@
             <if test="startTime != null">
                 AND sch.create_time_ >=#{startTime}
             </if>
-            <if test="startTime != null">
-                <![CDATA[   AND sch.create_time_<=#{startTime}
+            <if test="endTime != null">
+                <![CDATA[AND sch.create_time_<=#{endTime}
             ]]></if>
         </where>
     </sql>

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

@@ -96,9 +96,6 @@
 			<if test="vipGroupCategoryIdList != null">
 			vip_group_category_id_list_ = #{vipGroupCategoryIdList},
 			</if>
-			<if test="updateTime != null">
-			update_time_ = NOW(),
-			</if>
 			<if test="description != null">
 			description_ = #{description},
 			</if>
@@ -123,6 +120,7 @@
 			<if test="offlineClassJoinGradientRewards!=null">
 				offline_class_join_gradient_rewards_=#{offlineClassJoinGradientRewards},
 			</if>
+			update_time_ = NOW(),
 			</set> WHERE id_ = #{id}
 	</update>