Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -55,10 +55,6 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		if (userInfo == null) {
 			userInfo = sysUserService.initUser(principal,clientId,isRegister,isLessee);
 		}
-	
-//		if (userInfo.getSysUser().getUserType() != SysUserType.SYSTEM && !StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {
-//			throw new LockedException("用户不存在,请联系教务老师");
-//		}
 		if("EDUCATION".equals(clientId)){
 			clientId = "SYSTEM";
 		}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -57,20 +57,17 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	public SysUser queryByPhone(String phone) {
-		SysUser sysUser = sysUserDao.queryByPhone(phone);
-		return sysUser;
+		return sysUserDao.queryByPhone(phone);
 	}
 
 	@Override
 	public SysUserInfo queryUserInfoByUsername(String username) {
-		SysUser sysUser = queryByUsername(username);
-		return getSysUserInfo(sysUser);
+		return getSysUserInfo(queryByUsername(username));
 	}
 
 	@Override
 	public SysUserInfo queryUserInfoByPhone(String phone) {
-		SysUser sysUser = queryByPhone(phone);
-		return getSysUserInfo(sysUser);
+		return getSysUserInfo(queryByPhone(phone));
 	}
 
 	private SysUserInfo getSysUserInfo(SysUser sysUser) {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -94,14 +94,17 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "设置密码")
 	@PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
-			@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
+	@ApiImplicitParams({@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "username", value = "用户名", required = true, dataType = "String") })
-	public Object setPassword(String mobile, String password, String username) {
-		if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(password)) {
-			return failed();
+	public Object setPassword(String password, String username) {
+		if (StringUtils.isEmpty(password)) {
+			return failed("参数校验失败");
 		}
-		SysUser sysUser = sysUserService.queryByPhone(mobile);
+		AuthUser authUser = SecurityUtils.getUser();
+		if (authUser == null) {
+			return failed("获取用户信息失败");
+		}
+		SysUser sysUser = sysUserService.get(authUser.getUserId());
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}
@@ -126,7 +129,11 @@ public class UserController extends BaseController {
 		if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(newPassword)) {
 			return failed("参数校验异常");
 		}
-		SysUser sysUser = sysUserService.queryByPhone(mobile);
+		AuthUser authUser = SecurityUtils.getUser();
+		if (authUser == null) {
+			return failed("获取用户信息失败");
+		}
+		SysUser sysUser = sysUserService.get(authUser.getUserId());
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -175,11 +175,11 @@
     </select>
 
     <select id="queryByUsername" resultMap="SysUser">
-		select * from sys_user where username_ = #{username} OR phone_ = #{username} LIMIT 1
+		select * from sys_user where username_ = #{username} OR phone_ = #{username} LIMIT 1 FOR UPDATE
 	</select>
 
     <select id="queryByPhone" resultMap="SysUser">
-		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1
+		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
 	</select>
     <resultMap id="ImUserModel" type="com.ym.mec.common.entity.ImUserModel">
         <result column="id_" property="id"/>

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

@@ -202,4 +202,11 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @return
      */
     List<ClassGroup> getReportCourseTimes(@Param("classGroupIds") List<Integer> classGroupIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 根据课程组id查询课程组详情
+     * @param id
+     * @return
+     */
+    PracticeCourseDto findByGroupId(@Param("id") Integer id);
 }

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

@@ -398,6 +398,12 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      */
     List<BasicUserDto> findVipEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
     /**
+     * 获取相关vip教务的学员编号
+     * @param teacherId
+     * @return
+     */
+    List<BasicUserDto> findCommEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
+    /**
      * 获取相关陪练教务的学员编号
      * @param teacherId
      * @return
@@ -417,4 +423,11 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return
      */
     Set<Integer> findVipEducationalTeacherId(Integer studentId);
+
+    /**
+     * 获取学员相关的对外课教务老师
+     * @param studentId
+     * @return
+     */
+    Set<Integer> findCommEducationalTeacherId(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CoursesGroup.java

@@ -51,7 +51,10 @@ public class CoursesGroup {
 
 	/** 已冻结课时数 */
 	private Integer freezeMinutes;
-	
+
+	/** 教务老师 */
+	private Integer educationalTeacherId;
+
 	/** 报名结束时间 */
 	private java.util.Date applyClosingDate;
 	
@@ -73,6 +76,14 @@ public class CoursesGroup {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getEducationalTeacherId() {
+		return educationalTeacherId;
+	}
+
+	public void setEducationalTeacherId(Integer educationalTeacherId) {
+		this.educationalTeacherId = educationalTeacherId;
+	}
+
 	public Integer getConsumeMinutes() {
 		return consumeMinutes;
 	}

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

@@ -24,9 +24,20 @@ public class StudentManageAttendanceQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "老师名称",required = false)
     private String teacherName;
 
+    @ApiModelProperty(value = "课程状态",required = false)
+    private String courseStatus;
+
     @ApiModelProperty(value = "状态（正常、旷课、请假、休学）",required = false)
     private StudentAttendanceStatusEnum attendanceStatus;
 
+    public String getCourseStatus() {
+        return courseStatus;
+    }
+
+    public void setCourseStatus(String courseStatus) {
+        this.courseStatus = courseStatus;
+    }
+
     public Integer getStudentId() {
         return studentId;
     }

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

@@ -38,8 +38,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.ym.mec.biz.dal.enums.GroupType.PRACTICE;
-import static com.ym.mec.biz.dal.enums.GroupType.VIP;
+import static com.ym.mec.biz.dal.enums.GroupType.*;
 
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> implements ClassGroupService {
@@ -749,14 +748,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取网管课课程教务老师
         PracticeGroup practiceGroup = null;
         VipGroup vipGroup = null;
+        CoursesGroup coursesGroup = null;
         switch (groupType){
             case PRACTICE:
                 practiceGroup = practiceGroupDao.get(Long.parseLong(musicGroupId));
                 teacherIds.add(practiceGroup.getEducationalTeacherId());
                 break;
             case COMM:
-//                CoursesGroup coursesGroup = coursesGroupDao.get(groupId.longValue());
-//                teacherIds.add(coursesGroup.getEducationalTeacherId());
+                coursesGroup = coursesGroupDao.get(Long.parseLong(musicGroupId));
+                teacherIds.add(coursesGroup.getEducationalTeacherId());
                 break;
             case VIP:
                 vipGroup = vipGroupDao.get(Long.parseLong(musicGroupId));
@@ -782,6 +782,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         e.setTitle("教务老师");
                     }else if(groupType == VIP && vipGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == vipGroup.getEducationalTeacherId()){
                         e.setTitle("教务老师");
+                    }else if(groupType == COMM && coursesGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == coursesGroup.getEducationalTeacherId()){
+                        e.setTitle("教务老师");
                     }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
                         e.setTitle("指导老师");
                     }

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

@@ -157,7 +157,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         courseScheduleReview.setEducationalTeacherId(practiceGroup.getEducationalTeacherId());
         courseScheduleReview.setStudentId(practiceGroup.getStudentId());
         courseScheduleReview.setCreateTime(date);
-        courseSchedule.setUpdateTime(date);
+        courseScheduleReview.setUpdateTime(date);
         long num = courseScheduleReviewDao.insert(courseScheduleReview);
         if (num <= 0) {
             throw new BizException("评论提交失败，请重试");

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

@@ -1105,16 +1105,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         teacherIds.addAll(teacherDao.findVipTeacherIds(studentId));
         //获取陪练课老师列表
         teacherIds.addAll(teacherDao.findPracticeTeacherIds(studentId));
-        //获取陪练课,vip课代课老师关联
+        //获取对外课程老师列表
         teacherIds.addAll(teacherDao.findCloseCourseTeacherIds(studentId));
         //获取陪练课课程教务老师
         teacherIds.addAll(teacherDao.findPracticeEducationalTeacherId(studentId));
         //获取VIP课程教务老师
         teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
+        //获取对外课程务老师
+        teacherIds.addAll(teacherDao.findCommEducationalTeacherId(studentId));
         if(teacherIds.size() > 0){
         	return teacherDao.queryTeacherBaseInfo(teacherIds,search);
         }
-        return new ArrayList<BasicUserDto>();
+        return new ArrayList<>();
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;

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

@@ -191,6 +191,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		teachers.addAll(teacherDao.findCloseCourseStudentIds(teacherId, search));
 		//获取相关vip陪练教务的学员编号
 		teachers.addAll(teacherDao.findVipEducationalStudentId(teacherId,search));
+		teachers.addAll(teacherDao.findCommEducationalStudentId(teacherId,search));
 		teachers.addAll(teacherDao.findPracticeEducationalStudentId(teacherId,search));
 
 		return teachers.stream().distinct().collect(Collectors.toList());

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

@@ -400,8 +400,10 @@
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
         LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
         LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
-        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
-        AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2)
+        LEFT JOIN courses_group csg ON csg.id_ = cg.music_group_id_ AND cg.group_type_ = 'COMM'
+        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR
+        mg.director_user_id_ = #{userId} OR csg.educational_teacher_id_ = #{userId} OR vg.educational_teacher_id_ = #{userId})
+        AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR csg.status_ = 'NORMAL')
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>

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

@@ -26,6 +26,7 @@
 		<result column="total_course_discount_price_" property="totalCourseDiscountPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="educational_teacher_id_" property="educationalTeacherId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -40,13 +41,13 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CoursesGroup" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO courses_group (id_,name_,subject_id_,courses_start_date_,courses_end_date_,teaching_arrangement_,organ_id_,single_class_minutes_,status_,memo_,teacher_id_,max_student_num_,apply_closing_date_,teaching_plan_,teacher_salary_settlement_method_,total_courses_price_,total_course_discount_price_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{subjectId},#{coursesStartDate},#{coursesEndDate},#{teachingArrangement},#{organId},#{singleClassMinutes},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{teacherId},#{maxStudentNum},#{applyClosingDate},#{teachingPlan},#{teacherSalarySettlementMethod},#{totalCoursesPrice},#{totalCourseDiscountPrice},NOW(),NOW())
+		INSERT INTO courses_group (id_,name_,subject_id_,courses_start_date_,courses_end_date_,teaching_arrangement_,
+		organ_id_,single_class_minutes_,status_,memo_,teacher_id_,max_student_num_,apply_closing_date_,
+		teaching_plan_,teacher_salary_settlement_method_,total_courses_price_,total_course_discount_price_,create_time_,update_time_,educational_teacher_id_)
+		VALUES(#{id},#{name},#{subjectId},#{coursesStartDate},#{coursesEndDate},#{teachingArrangement},
+		#{organId},#{singleClassMinutes},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		#{memo},#{teacherId},#{maxStudentNum},#{applyClosingDate},#{teachingPlan},#{teacherSalarySettlementMethod},
+		#{totalCoursesPrice},#{totalCourseDiscountPrice},NOW(),NOW(),#{educationalTeacherId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -56,6 +57,9 @@
 			<if test="coursesEndDate != null">
 				courses_end_date_ = #{coursesEndDate},
 			</if>
+			<if test="educationalTeacherId != null">
+				educational_teacher_id_ = #{educationalTeacherId},
+			</if>
 			<if test="subjectId != null">
 				subject_id_ = #{subjectId},
 			</if>

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

@@ -364,4 +364,10 @@
         AND (del_flag_ =0 OR del_flag_ IS NULL)
         GROUP BY class_group_id_
     </select>
+
+    <select id="findByGroupId" resultMap="PracticeCourseDto">
+        SELECT pg.*,s.name_ subject_name_ FROM practice_group pg
+        LEFT JOIN subject s on pg.subject_id_ = s.id_
+        WHERE pg.id_ = #{id}
+    </select>
 </mapper>

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

@@ -13,6 +13,7 @@
         <result property="currentCLassTimes" column="current_class_times_" />
         <result property="totalClassTimes" column="total_class_times_" />
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="courseStatus" column="courseStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap id="studentManageAccountBaseInfo" type="com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto">
@@ -249,10 +250,12 @@
     <sql id="studentManageAttendanceQueryCondition">
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND CONCAT(cs.class_date_," ",cs.start_class_time_) &lt; NOW()
             <if test="studentId!=null">
                 AND cssp.user_id_ = #{studentId}
             </if>
+            <if test="courseStatus != null">
+                AND cs.status_ = #{courseStatus}
+            </if>
             <if test="classGroupType!=null">
                 AND cg.type_ = #{classGroupType}
             </if>
@@ -280,7 +283,8 @@
             su.real_name_ teacher_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
             sa.current_class_times_,
-            cg.total_class_times_
+            cg.total_class_times_,
+            cs.status_ courseStatus
         FROM course_schedule_student_payment cssp
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
             LEFT JOIN class_group cg ON cssp.class_group_id_ = cg.id_

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

@@ -907,6 +907,14 @@
         WHERE cssp.group_type_ = 'VIP' AND vg.educational_teacher_id_ = #{teacherId}
         GROUP BY su.id_
     </select>
+    <select id="findCommEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
+        FROM courses_group vg
+        LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+        LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+        WHERE cssp.group_type_ = 'COMM' AND vg.educational_teacher_id_ = #{teacherId}
+        GROUP BY su.id_
+    </select>
     <select id="findPracticeEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
         SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
         FROM practice_group pg
@@ -927,4 +935,10 @@
         LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_
         WHERE cgsm.group_type_ = 'VIP' AND cgsm.user_id_ = #{userId}
     </select>
+    <select id="findCommEducationalTeacherId" resultType="java.lang.Integer">
+        SELECT DISTINCT vg.educational_teacher_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgsm.class_group_id_ = cgtm.class_group_id_
+        LEFT JOIN courses_group vg ON vg.id_ = cgsm.music_group_id_
+        WHERE cgsm.group_type_ = 'COMM' AND cgsm.user_id_ = #{userId}
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -66,6 +66,8 @@ public class ExportController extends BaseController {
     private CourseScheduleService scheduleService;
     @Autowired
     private SporadicChargeInfoService sporadicChargeInfoService;
+    @Autowired
+    private PracticeGroupDao practiceGroupDao;
 
     @ApiOperation(value = "导出老师课酬")
     @PostMapping("export/teacherSalary")
@@ -523,6 +525,16 @@ public class ExportController extends BaseController {
                 if(userSchool!= null){
                     row.setSchoolName(userSchool.getName());
                 }
+            }else if (row.getGroupType().equals(GroupType.PRACTICE)) {
+                row.setCourseFee(row.getActualAmount());
+                School userSchool = musicGroupDao.findUserSchool(row.getUserId());
+                if(userSchool!= null){
+                    row.setSchoolName(userSchool.getName());
+                }
+                PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(row.getMusicGroupId()));
+                if (practiceGroup != null) {
+                    row.setSubjectName(practiceGroup.getSubjectName());
+                }
             }
             String paymentChannel = "";
             if (row.getPaymentChannel() == null) {