Merge remote-tracking branch 'origin/master'

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

@@ -9,10 +9,10 @@ public class ExportTeacherSalaryDto{
     private  Integer teacherId;
 
     //老师姓名
-    private Integer teacherName;
+    private String teacherName;
 
     //老师分部
-    private Integer teacherOrganName;
+    private String teacherOrganName;
 
     //工作类别
     private String jobType;
@@ -72,7 +72,7 @@ public class ExportTeacherSalaryDto{
     private String address;
 
     //奖励金额
-    private double rewards;
+    private Double rewards;
 
     //线下课单价
     private double offlineClassesUnitPrice;
@@ -99,11 +99,11 @@ public class ExportTeacherSalaryDto{
         this.onlineClassesUnitPrice = onlineClassesUnitPrice;
     }
 
-    public double getRewards() {
+    public Double getRewards() {
         return rewards;
     }
 
-    public void setRewards(double rewards) {
+    public void setRewards(Double rewards) {
         this.rewards = rewards;
     }
 
@@ -139,19 +139,19 @@ public class ExportTeacherSalaryDto{
         this.teacherId = teacherId;
     }
 
-    public Integer getTeacherName() {
+    public String getTeacherName() {
         return teacherName;
     }
 
-    public void setTeacherName(Integer teacherName) {
+    public void setTeacherName(String teacherName) {
         this.teacherName = teacherName;
     }
 
-    public Integer getTeacherOrganName() {
+    public String getTeacherOrganName() {
         return teacherOrganName;
     }
 
-    public void setTeacherOrganName(Integer teacherOrganName) {
+    public void setTeacherOrganName(String teacherOrganName) {
         this.teacherOrganName = teacherOrganName;
     }
 

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

@@ -124,7 +124,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                 e.setOrganName(organNames.get(e.getOrganId()));
                 e.setMusicGroupName(musicGroupNames.get(e.getUserId().longValue()));
                 e.setVipGroupName(vipGroupNames.get(e.getUserId()));
-                e.setSubjectName(subjectNames.get(e.getUserId()));
+                e.setSubjectName(subjectNames.get(e.getUserId().longValue()));
                 e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId().longValue()));
                 e.setVipGroupStatus(vipGroupStatus.get(e.getUserId()));
                 if(hasCourse == null){

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

@@ -539,7 +539,7 @@
 		LEFT JOIN organization mgo ON mgo.id_ = mg.organ_id_
 		LEFT JOIN charge_type ct ON ct.id_ = mg.charge_type_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'MUSIC'
-		GROUP BY ts.course_schedule_id_,ts.`user_id_`
+		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="exportVipTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
 		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,vgo.name_ courseOrganName,vg.name_ groupName,
@@ -568,7 +568,7 @@
 		LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'VIP'
-		GROUP BY ts.course_schedule_id_,ts.`user_id_`
+		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="querySettlementScheduleId" resultType="java.lang.Long">
 		SELECT DISTINCT csts.course_schedule_id_ FROM course_schedule_teacher_salary csts
@@ -600,6 +600,6 @@
 		LEFT JOIN practice_group pg ON (pg.id_ = ts.music_group_id_ AND ts.group_type_ = 'PRACTICE')
 		LEFT JOIN organization pgo ON pgo.id_ = pg.organ_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE'
-		GROUP BY ts.course_schedule_id_,ts.`user_id_`
+		GROUP BY ts.id_,ta.id_
 	</select>
 </mapper>

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

@@ -261,7 +261,16 @@
 	</select>
 
     <select id="queryNotDoneHomeworkList" resultMap="StudentCourseHomeworkFull">
-		SELECT sch.*,cg.name_ classGroupName,mg.name_ musicGroupName FROM student_course_homework sch left join course_homework ch on sch.course_homework_id_ = ch.id_ left join music_group mg on ch.music_group_id_ = mg.id_ left join class_group cg on ch.class_group_id_ = cg.id_ where sch.status_ = 0
+        SELECT
+        sch.*, cg.name_ classGroupName,
+        mg.name_ musicGroupName
+        FROM
+        student_course_homework sch
+        LEFT JOIN course_homework ch ON sch.course_homework_id_ = ch.id_
+        LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
+        LEFT JOIN class_group cg ON ch.class_group_id_ = cg.id_
+        WHERE
+        sch.status_ = 0 AND datediff(NOW(),sch.create_time_) &lt; 8
 	</select>
     <select id="countStudentCourseHomeworks" resultType="java.lang.Integer">
         SELECT COUNT(id_) FROM course_schedule_student_payment WHERE course_schedule_id_ = #{search}

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

@@ -799,7 +799,7 @@
     </select>
     <select id="queryTeacherImModel" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
         SELECT su.id_,su.avatar_,
-        CASE WHEN su.username_ IS NULL THEN su.real_name_ END username_
+        CASE WHEN su.username_ IS NULL THEN su.real_name_ ELSE su.real_name_ END username_
         FROM sys_user su
         WHERE su.id_ IN
         <foreach collection="teacherIds" item="userId" open="(" close=")" separator=",">

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

@@ -85,8 +85,8 @@ public class ExportController extends BaseController {
                     "上课时间", "签到状态", "签退状态", "签到时间", "签退时间",
                     "主辅", "上课地点", "应到学员","课时课酬","阶梯奖励"}, new String[]{
                     "courseScheduleId", "teacherId", "teacherName", "teacherOrganName", "jobType",
-                    "courseOrganName", "groupName", "changeType", "activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
-                    "courseScheduleType","signCourseScheduleTime","currentTime","classDate","start_class_time_","signInStatus",
+                    "courseScheduleOrganName", "groupName", "changeType", "activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
+                    "courseScheduleType","signCourseScheduleTime","currentTime","classDate","courseScheduleStartTime","signInStatus",
                     "signOutStatus","signInTime","signOutTime","teacherRole","address","studentNum","price","rewards"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -22,7 +22,7 @@ public class TeacherDefaultPracticeGroupSalaryController extends BaseController
 
 	@ApiOperation(value = "获取教师的陪练课课酬列表")
 	@GetMapping("/queryPageByTeacherId")
-	@PreAuthorize("@pcs.hasPermissions('teacherDefaultPracticeGroupSalary/queryByTeacherId')")
+	@PreAuthorize("@pcs.hasPermissions('teacherDefaultPracticeGroupSalary/queryPageByTeacherId')")
 	public Object queryByTeacherId(Integer teacherId) {
 		return succeed(teacherDefaultPracticeGroupSalaryService.queryByUserId(teacherId));
 	}