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

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

@@ -42,6 +42,10 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "学员评分",required = false)
     private Integer studentReview;
 
+    @ApiModelProperty(value = "是否布置作业")
+    private Integer assignHomework;
+    private String assignHomeworkStr;
+
     @ApiModelProperty(value = "是否提交作业",required = false)
     private Integer handHomework;
 
@@ -123,6 +127,22 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "考勤Str",required = false)
     private String attendanceStr;
 
+    public String getAssignHomeworkStr() {
+        return assignHomeworkStr;
+    }
+
+    public void setAssignHomeworkStr(String assignHomeworkStr) {
+        this.assignHomeworkStr = assignHomeworkStr;
+    }
+
+    public Integer getAssignHomework() {
+        return assignHomework;
+    }
+
+    public void setAssignHomework(Integer assignHomework) {
+        this.assignHomework = assignHomework;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -29,6 +29,9 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否评价 1-评价 0未评价",required = false)
     private Integer hasReview;
 
+    @ApiModelProperty(value = "是否布置作业")
+    private Integer assignHomework;
+
     @ApiModelProperty(value = "是否提价作业 1-提交 0未提交",required = false)
     private Integer hasHandHomework;
 
@@ -53,6 +56,14 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "作业是否回复",required = false)
     private Integer homeWorkReplied;
 
+    public Integer getAssignHomework() {
+        return assignHomework;
+    }
+
+    public void setAssignHomework(Integer assignHomework) {
+        this.assignHomework = assignHomework;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -16,6 +16,8 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "周一日期")
     private java.util.Date monday;
 
+    private Integer teacherId;
+
     @ApiModelProperty(value = "周日日期")
     private java.util.Date sunday;
 
@@ -34,6 +36,14 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "及时训练评价次数是否达到预期")
     private Integer exercisesMessageTimelyNumIsAchieve;
 
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
     public String getOrganIdList() {
         return organIdList;
     }

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

@@ -448,7 +448,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	public void addStudentAttendanceRecord(Integer courseScheduleId, Integer userId, StudentAttendanceStatusEnum statusEnum,SignStatusEnum signStatusEnum) {
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
 		ClassGroup classGroup = classGroupDao.findByCourseSchedule(courseScheduleId);

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

@@ -141,6 +141,7 @@
         <result column="review_id_" property="reviewId"/>
         <result column="student_review_" property="studentReview"/>
         <result column="hand_homework_" property="handHomework"/>
+        <result column="assign_homework_" property="assignHomework"/>
         <result column="course_review_" property="courseReview"/>
         <result column="teacher_id" property="teacherId"/>
         <result column="start_class_time_" jdbcType="DATE" property="startClassTime"/>
@@ -190,6 +191,12 @@
             <if test="studentReview !=null">
                 AND csc.score_ =#{studentReview}
             </if>
+            <if test="assignHomework != null and assignHomework == 1">
+                AND sch.id_>0
+            </if>
+            <if test="assignHomework != null and assignHomework ==0">
+                AND sch.id_ IS NULL
+            </if>
             <if test='hasReview !=null and hasReview=="1"'>
                 AND csr.id_ > 0
             </if>
@@ -239,7 +246,8 @@
         edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_ student_review_,
         csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
         csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,sa.id_
-        attendance_id_,sch.is_replied_ home_work_replied_
+        attendance_id_,sch.is_replied_ home_work_replied_,
+        CASE WHEN sch.id_ IS NULL THEN 0 ELSE 1 END assign_homework_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_ AND cs.group_type_='PRACTICE'
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_

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

@@ -139,6 +139,9 @@
 		WHERE
 			sees.monday_ >= #{monday}
 			AND sees.sunday_ <= #{sunday}
+			<if test="teacherId!=null">
+				AND sees.teacher_id_ = #{teacherId}
+			</if>
 			<if test="search!=null">
 				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%') OR tea.real_name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
@@ -190,6 +193,9 @@
 			WHERE
 			sees.monday_ &gt;= #{monday}
 			AND sees.sunday_ &lt;= #{sunday}
+			<if test="teacherId!=null">
+				AND sees.teacher_id_ = #{teacherId}
+			</if>
 			<if test="search!=null">
 				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%') OR tea.real_name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>

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

@@ -903,10 +903,15 @@ public class ExportController extends BaseController {
                 } else {
                     row.setAttendanceStr("否");
                 }
+                if(new Integer(1).equals(row.getAssignHomework())){
+                    row.setAssignHomeworkStr("是");
+                }else{
+                    row.setAssignHomeworkStr("否");
+                }
             }
 
-            String[] header = {"分部", "上课日期", "学生编号", "课程编号", "学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "学员评分", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
-            String[] body = {"organName", "classDateStr", "studentId", "id", "attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "studentReview", "handHomeworkStr", "homeWorkReplied", "eduTeacherName", "courseReview"};
+            String[] header = {"分部", "上课日期", "学生编号", "课程编号", "学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "学员评分", "是否布置作业", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
+            String[] body = {"organName", "classDateStr", "studentId", "id", "attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "studentReview", "assignHomeworkStr", "handHomeworkStr", "homeWorkReplied", "eduTeacherName", "courseReview"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");