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

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

@@ -466,4 +466,13 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 	 * @return java.util.List<com.ym.mec.biz.dal.dto.IntegerAndIntegerListDto>
 	 */
 	List<IntegerAndIntegerListDto> findClassGroupAndUserIdsMap(@Param("classGroupIds") List<Integer> classGroup);
+
+	/**
+	 * @describe 获取指定日期的课程
+	 * @author Joburgess
+	 * @date 2019/11/3
+	 * @param date: 日期
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+	 */
+	List<CourseSchedule> findCourseScheduleWithDate(@Param("date") Date date);
 }

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

@@ -7,6 +7,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +46,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
      * @Date: 2019/10/15
      * @params [days:天数]
      * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary>
-     * @describe 获取多少天之前的未结算教师课酬记录
+     * @describe 获取多少天之前的未结算教师课酬记录（vip课）
      */
     List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
 

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

@@ -103,4 +103,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<MusicGroup> queryListByIds(@Param("musicGroupIds") String musicGroupIds);
-}
+
+    /**
+     * @describe 根据乐团获取对应的结算方式
+     * @author Joburgess
+     * @date 2019/11/3
+     * @param musicGroupIds: 乐团编号列表
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.String>>
+     */
+    List<Map<String,String>> findSettlementTypeByMusicGroups(@Param("musicGroupIds") List<String> musicGroupIds);
+}

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

@@ -12,6 +12,26 @@ public class VipGroupQueryInfo extends QueryInfo {
 
     private Long vipGroupId;
 
+    private Integer teacherId;
+
+    private Integer activityId;
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
     public Long getVipGroupId() {
         return vipGroupId;
     }

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

@@ -30,8 +30,16 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @Date: 2019/10/15
      * @params []
      * @return void
-     * @describe 教师课酬结算
+     * @describe 教师vip课课酬结算
      */
     void teacherSalarySettlement();
 
-}
+    /**
+     * @describe 教师乐团课课酬结算
+     * @author Joburgess
+     * @date 2019/11/3
+     * @return void
+     */
+    void musicGroupTeacherSalarySettlement();
+
+}

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

@@ -122,7 +122,6 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 BigDecimal salary = new BigDecimal("0");
                 List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList = classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
 
-
                 for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalaryList) {
                     //对应基准课酬
 //                    BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.date.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 	private VipGroupService vipGroupService;
 	@Autowired
 	private SchoolService schoolService;
+	@Autowired
+	private CourseScheduleDao courseScheduleDao;
+	@Autowired
+	private TeacherDefaultMusicGroupSalaryDao teacherDefaultMusicGroupSalaryDao;
 	
 	@Autowired
 	private SysConfigDao sysConfigDao;
@@ -236,4 +241,14 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 		});
 
 	}
+
+	@Override
+	public void musicGroupTeacherSalarySettlement() {
+		Date now=new Date();
+		Date yesterday= DateUtil.addDays1(now,-1);
+		List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
+		//获取昨天的课程计划
+		List<CourseSchedule> yesterdayCourseSchedules = courseScheduleDao.findCourseScheduleWithDate(yesterday);
+
+	}
 }

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

@@ -362,27 +362,27 @@
 
     <select id="getCourseSchedulesWithDate" resultMap="courseScheduleDto">
         SELECT
-        cg.id_ seal_class_id_,
-        cs.name_,
-        cs.type_,
-        cs.id_,
-        cs.class_date_,
-        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-        CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-        cs.status_,
-        cs.student_num_,
-        cs.leave_student_num_,
-        cg.student_num_ total_student_num_,
-        su.username_ teacher_name_,
-        ta.sign_in_status_ attendance_status_
+            cg.id_ seal_class_id_,
+            cs.name_,
+            cs.type_,
+            cs.id_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.status_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cg.student_num_ total_student_num_,
+            su.username_ teacher_name_,
+            ta.sign_in_status_ attendance_status_
         FROM
-        music_group mg
-        LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
-        LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
-        LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
+            music_group mg
+            LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
+            LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
+            LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
+            LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
         WHERE
-        mg.organ_id_ = #{organId}
+            mg.organ_id_ = #{organId}
         AND cs.id_ IS NOT NULL
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
@@ -1131,4 +1131,11 @@
             #{classGroupId}
         </foreach>
     </select>
+    <select id="findCourseScheduleWithDate" resultMap="CourseSchedule">
+        SELECT
+            cs.*
+        FROM
+            course_schedule cs
+        WHERE cs.class_date_=DATE_FORMAT(#{date},'%Y-%m-%d %H:%i:%s')
+    </select>
 </mapper>

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

@@ -159,6 +159,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
 		WHERE
 		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) <= DATE_ADD( NOW( ), INTERVAL - 7 DAY )
+		AND cs.type_='VIP'
 		AND csts.settlement_time_ IS NULL
     </select>
     

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

@@ -301,4 +301,16 @@
     <select id="queryListByIds" resultMap="MusicGroup" parameterType="list">
 		SELECT * FROM music_group WHERE FIND_IN_SET(id_,#{musicGroupIds})
 	</select>
+    <select id="findSettlementTypeByMusicGroups" resultType="map">
+		SELECT
+			id_ AS 'key',
+			settlement_type_ AS 'value'
+		FROM
+			music_group
+		WHERE
+			id_ IN
+			<foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
+				#{musicGroupId}
+			</foreach>
+    </select>
 </mapper>

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

@@ -118,8 +118,15 @@
 
     <sql id="vipGroupQueryCondition">
         <where>
+            1=1
             <if test="search!=null and search!=''">
-                vg.name LIKE CONCAT('%',#{search},'%')
+                AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_=#{search})
+            </if>
+            <if test="teacherId!=null">
+                AND vg.user_id_=#{teacherId}
+            </if>
+            <if test="activityId!=null">
+                AND vg.vip_group_activity_id_=#{activityId}
             </if>
             <if test="organId!=null">
                 AND FIND_IN_SET(#{organId},vg.organ_id_list_)