Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -195,7 +195,7 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
         }
 
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.NEED_POST_STUDY_REPORT,
-                userMap, null, 0, "5?" + pushUrl, "TEACHER");
+                userMap, null, 0, "8?" + pushUrl, "TEACHER");
 
     }
 }

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

@@ -3472,7 +3472,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     @Override
     public PageInfo<PracticeGroupDto> findPracticeGroupReviews(PracticeGroupQueryInfo queryInfo) {
-        queryInfo.setMonth(queryInfo.getMonth() + "-01");
+        queryInfo.setMonth(queryInfo.getMonth());
         PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);

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

@@ -270,6 +270,9 @@
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
             pg.group_status_='NORMAL'
+            <if test="month != null">
+                AND DATE_FORMAT(cse.create_time_, '%Y-%m') = #{month}
+            </if>
             <if test="search!=null and search!=''">
                 AND (pg.name_ LIKE CONCAT('%',#{search},'%') OR pg.id_= #{search})
             </if>
@@ -311,8 +314,7 @@
         FROM
         practice_group pg
         LEFT JOIN sys_user su ON pg.user_id_ = su.id_
-        LEFT JOIN course_schedule_evaluate cse ON pg.id_=cse.music_group_id_ AND DATE_FORMAT(cse.create_time_, '%Y%m') =
-        DATE_FORMAT(#{month},'%Y%m')
+        LEFT JOIN course_schedule_evaluate cse ON pg.id_=cse.music_group_id_
         <include refid="practiceGroupReviewsQueryCondition"/>
         ORDER BY pg.id_ DESC
         <include refid="global.limit"/>
@@ -321,8 +323,7 @@
 
     <select id="countPracticeGroupReviews" resultType="java.lang.Integer">
         SELECT count(*) FROM practice_group pg
-        LEFT JOIN course_schedule_evaluate cse ON pg.id_=cse.music_group_id_ AND DATE_FORMAT(cse.create_time_, '%Y%m') =
-        DATE_FORMAT(#{month},'%Y%m')
+        LEFT JOIN course_schedule_evaluate cse ON pg.id_=cse.music_group_id_
         <include refid="practiceGroupReviewsQueryCondition"/>
     </select>