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

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

@@ -22,6 +22,8 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "状态（在读、请假、退学）",required = false)
     private ClassGroupStudentStatusEnum studentStatus;
+    
+    private Boolean isActive;
 
     public String getStudentName() {
         return studentName;
@@ -54,4 +56,12 @@ public class StudentManageQueryInfo extends QueryInfo {
     public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
+
+	public Boolean getIsActive() {
+		return isActive;
+	}
+
+	public void setIsActive(Boolean isActive) {
+		this.isActive = isActive;
+	}
 }

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

@@ -215,7 +215,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
 					.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
 							courseHomework.getId());
-			if(CollectionUtils.isEmpty(studentCourseHomeworks)){
+			if(!CollectionUtils.isEmpty(studentCourseHomeworks)){
 				throw new BizException("此课程没有学生");
 			}
 			studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -93,9 +93,11 @@
                 <div class="iInfo">
                     <span>学生姓名：${studentInfo.name!}</span>
                 </div>
+                <#if studentInfo.grade??>
                 <div class="iInfo">
                     <span>所在班级：${studentInfo.grade!} ${studentInfo.clazz!}</span>
                 </div>
+                </#if>
                 <div class="iInfo">
                     <span>所在声部：${studentInfo.subject.name!}</span>
                 </div>

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

@@ -222,7 +222,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
 		WHERE 1=1
 		<if test="days!=null">
-			AND cs.class_date_ = DATE_FORMAT(DATE_ADD( NOW( ), INTERVAL - #{days} DAY ),'%Y-%m-%d')
+			AND cs.class_date_ &lt;= DATE_FORMAT(DATE_ADD( NOW( ), INTERVAL - #{days} DAY ),'%Y-%m-%d')
 		</if>
 		AND cs.type_='VIP'
 		AND csts.settlement_time_ IS NULL

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

@@ -136,6 +136,12 @@
             <if test="search != null and search != ''">
                 AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ LIKE CONCAT('%',#{search},'%'))
             </if>
+            <if test="isActive != null and isActive == true">
+            	and su.password_ is not null
+            </if>
+            <if test="isActive != null and isActive == false">
+            	and su.password_ is null
+            </if>
         </where>
     </sql>