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

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

@@ -86,6 +86,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
                                                        @Param("subjectIds") String subjectIds);
 
     /**
+     * @describe 获取教师
+     * @author Joburgess
+     * @date 2019/12/26
+     * @param teacherId:
+     * @return com.ym.mec.biz.dal.dto.TeacherBasicDto
+     */
+    TeacherBasicDto findByTeacherId(@Param("teacherId")Integer teacherId);
+
+    /**
      * count上课结算列表
      * @param params
      * @return

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupStudentSignDto.java

@@ -16,6 +16,17 @@ public class MusicGroupStudentSignDto{
     @ApiModelProperty(value = "课程名称",required = false)
     private String courseScheduleName;
 
+    @ApiModelProperty(value = "班级名称",required = false)
+    private String classGroupName;
+
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -23,6 +23,17 @@ public class StudentSignQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团编号",required = false)
     private String musicGroupId;
 
+    @ApiModelProperty(value = "班级编号")
+    private Integer classGroupId;
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public void setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+    }
+
     public String getStartTime() {
         return startTime;
     }

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

@@ -409,7 +409,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 updateFlag = true;
                 break;
             }
-            MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
+            MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
             int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
             musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
             if (studentRegistration.getTemporaryCourseFee() == null && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {

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

@@ -390,6 +390,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 	@Override
 	public TeacherSignOutDto getTeacherSignDetail(Integer courseScheduleId, Integer userId) {
+		if(Objects.isNull(courseScheduleId)){
+			throw new BizException("请指定课程");
+		}
 		TeacherSignOutDto teacherSignDetail = new TeacherSignOutDto();
 		TeacherAttendance teacherAttendanceInfo = teacherAttendanceDao.findByTeacherAttendanceInfo(userId.longValue(), courseScheduleId.longValue());
 		teacherSignDetail.setTeacherAttendanceInfo(teacherAttendanceInfo);

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

@@ -1820,12 +1820,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 		List<Map<Integer, BigDecimal>> maps = vipGroupDao.countSurplusCourseFee(vipGroupId);
     	if(CollectionUtils.isEmpty(maps)||(maps.size()==1&&Objects.isNull(maps.get(0)))){
-			vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
-			vipGroupDao.update(vipGroup);
-			if(vipGroup.getStatus().equals(VipGroupStatusEnum.PROGRESS)){
+			if(courseScheduleIds != null && courseScheduleIds.size() > 0){
 				courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
 				courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
 			}
+			vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
+			vipGroupDao.update(vipGroup);
 			stopVipPush(vipGroup.getId(),vipGroup.getName());
 			return;
 		}
@@ -2490,7 +2490,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
 		List<TeacherBasicDto> teacherByOrganAndSubject = teacherDao.findTeacherByOrganAndSubject(vipGroup.getOrganId().toString(), classGroup.getSubjectIdList());
-
+        if(CollectionUtils.isEmpty(teacherByOrganAndSubject)){
+            teacherByOrganAndSubject=new ArrayList<>();
+            teacherByOrganAndSubject.add(teacherDao.findByTeacherId(vipGroup.getUserId()));
+        }
 		return teacherByOrganAndSubject;
 	}
 }

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

@@ -455,12 +455,14 @@
         <result property="name" column="real_name_"/>
         <result property="signStatus" column="status_"/>
         <result property="courseScheduleName" column="name_"/>
+        <result property="classGroupName" column="class_group_name_"/>
     </resultMap>
     <select id="queryMusicGroupStudentsSign" resultMap="MusicGroupStudentSignDto">
-        SELECT sa.create_time_,su.username_ real_name_,sa.status_,cs.name_
+        SELECT sa.create_time_,su.username_ real_name_,sa.status_,cs.name_,cg.name_ class_group_name_
         FROM student_attendance sa
         LEFT JOIN sys_user su ON sa.user_id_ = su.id_
         LEFT JOIN course_schedule cs ON sa.course_schedule_id_ = cs.id_
+        LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_
         <include refid="queryMusicGroupStudentsSignSql"/>
         <include refid="global.limit"/>
     </select>
@@ -486,6 +488,9 @@
             <if test="userName != null">
                 AND su.username_ LIKE CONCAT('%',#{userName},'%')
             </if>
+            <if test="classGroupId != null">
+                AND sa.class_group_id_ = #{classGroupId}
+            </if>
         </where>
     </sql>
 

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

@@ -287,7 +287,7 @@
     </select>
 
     <select id="countPayNum" resultType="map">
-        SELECT COUNT(DISTINCT user_id_) `value`,subject_id_ `key` FROM student_registration
+        SELECT COUNT(DISTINCT user_id_) `value`,actual_subject_id_ `key` FROM student_registration
         WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND music_group_status_ != 'QUIT' GROUP BY subject_id_
     </select>
 

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

@@ -301,6 +301,18 @@
             FIND_IN_SET(t.subject_id_, #{subjectIds})
             AND INTE_ARRAY ( CONCAT(t.organ_id_,',',t.flow_organ_range_), #{organIds} )
     </select>
+    <select id="findByTeacherId" resultMap="TeacherBasicDto">
+        SELECT
+            su.id_,
+            su.username_,
+            su.real_name_,
+            t.organ_id_
+        FROM
+            teacher t
+            LEFT JOIN sys_user su ON t.id_ = su.id_
+        WHERE
+            t.id_=#{teacherId}
+    </select>
     <select id="countCloses" resultType="java.lang.Integer">
         SELECT COUNT(cs.id_)
         FROM course_schedule cs

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -100,7 +100,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @GetMapping("/getCurrentCourseDetail")
     public Object getCurrentCourseDetail(Long courseID){
         if(Objects.isNull(courseID)){
-            return failed(HttpStatus.FORBIDDEN, "请指定课程!");
+            return failed("请指定课程!");
         }
         return succeed(scheduleService.getCurrentCourseDetail(courseID));
     }

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

@@ -24,7 +24,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -286,7 +285,7 @@ public class VipGroupManageController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/classStartDateAdjust')")
     public Object classStartDateAdjust(ClassDateAdjustDto classDateAdjustDto){
         if(Objects.isNull(classDateAdjustDto.getId())){
-            return failed(HttpStatus.FORBIDDEN, "请指定课程!");
+            return failed( "请指定课程!");
         }
         CourseSchedule courseSchedule = scheduleService.get(classDateAdjustDto.getId());
         if(Objects.isNull(classDateAdjustDto.getClassGroupId())){