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

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

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

@@ -5,9 +5,9 @@ import com.ym.mec.biz.dal.entity.PracticeGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.PracticeGroupQueryInfo;
 import com.ym.mec.biz.dal.page.StudentBuyPracticeQueryInfo;
+import com.ym.mec.biz.dal.page.StudentQueryInfo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.Date;
@@ -285,7 +285,7 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
 	 * @param queryInfo:
 	 * @return com.ym.mec.common.page.PageInfo<com.ym.mec.biz.dal.dto.SimpleUserDto>
 	 */
-	PageInfo<SimpleUserDto> findConvertDefeatStudents(QueryInfo queryInfo);
+	PageInfo<SimpleUserDto> findConvertDefeatStudents(StudentQueryInfo queryInfo);
 
 
 	/**

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

@@ -732,8 +732,8 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         ZoneId zoneId = ZoneId.systemDefault();
 
         LocalDate monday = LocalDate.parse(mondayStr, ddf);
-        if(monday.isBefore(LocalDate.now())){
-            monday=LocalDate.now();
+        if(monday.compareTo(LocalDate.now())<=0){
+            monday=LocalDate.now().plusDays(1);
         }
         LocalDate sunday = monday.with(weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 

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

@@ -111,6 +111,7 @@ import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.PracticeGroupQueryInfo;
 import com.ym.mec.biz.dal.page.StudentBuyPracticeQueryInfo;
+import com.ym.mec.biz.dal.page.StudentQueryInfo;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.GroupClassService;
@@ -131,7 +132,6 @@ import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
@@ -3703,7 +3703,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     }
 
     @Override
-    public PageInfo<SimpleUserDto> findConvertDefeatStudents(QueryInfo queryInfo) {
+    public PageInfo<SimpleUserDto> findConvertDefeatStudents(StudentQueryInfo queryInfo) {
         PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);

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

@@ -1130,7 +1130,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		for (ClassGroupStudentMapper classGroupStudent : classGroupStudents) {
 			courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentForVipGroup(vipGroupId,classGroupStudent.getUserId());
 			try {
-				teacherCourseRewardService.addConvertReward(classGroupStudent.getUserId(), vipGroupApplyBaseInfoDto.getUserId());
+				if(vipGroupApplyBaseInfoDto.getOnlineClassesNum()>0){
+					teacherCourseRewardService.addConvertReward(classGroupStudent.getUserId(), vipGroupApplyBaseInfoDto.getUserId());
+				}
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

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

@@ -521,7 +521,13 @@
             practice_group pg
             LEFT JOIN sys_user su ON pg.student_id_ = su.id_
         WHERE
-            pg.type_='FREE'
+            pg.type_ IN ('FREE', 'TRIAL')
+            <if test="organIdList!=null">
+                AND su.organ_id_ IN
+                <foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
+                    #{organId}
+                </foreach>
+            </if>
             <if test="search != null">
                 AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
             </if>
@@ -529,7 +535,7 @@
                 SELECT student_id_ FROM practice_group WHERE type_='CHARGE'
             )
             AND NOT EXISTS (
-                SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=pg.student_id_ AND cs.teach_mode_='ONLINE' AND cs.class_date_>'2020-05-01'
+                SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=pg.student_id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
             )
         <include refid="global.limit"/>
     </select>
@@ -540,7 +546,13 @@
             practice_group pg
             LEFT JOIN sys_user su ON pg.student_id_ = su.id_
         WHERE
-            pg.type_='FREE'
+            pg.type_ IN ('FREE', 'TRIAL')
+            <if test="organIdList!=null">
+            AND su.organ_id_ IN
+                <foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
+                    #{organId}
+                </foreach>
+            </if>
             <if test="search != null">
                 AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
             </if>
@@ -548,7 +560,7 @@
                 SELECT student_id_ FROM practice_group WHERE type_='CHARGE'
             )
             AND NOT EXISTS (
-                SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=pg.student_id_ AND cs.teach_mode_='ONLINE' AND cs.class_date_>'2020-05-01'
+                SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=pg.student_id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
             )
     </select>
     <select id="findEnableAssignTeachers" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPracticeGroupController.java

@@ -15,7 +15,6 @@ import com.ym.mec.biz.service.TeacherCourseRewardService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -205,11 +204,18 @@ public class EduPracticeGroupController extends BaseController {
 
     @ApiOperation("获取转化失败的学员列表")
     @GetMapping(value = "/findConvertDefeatStudents")
-    public HttpResponseResult findConvertDefeatStudents(QueryInfo queryInfo){
+    public HttpResponseResult findConvertDefeatStudents(StudentQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(employee.getOrganIdList())){
+                return failed("用户所在分部异常");
+            }
+            queryInfo.setOrganIdList(Arrays.asList(employee.getOrganIdList().split(",")));
+        }
         return succeed(practiceGroupService.findConvertDefeatStudents(queryInfo));
     }