Merge branch 'zx_saas_0303' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.dto;
 //学员学习是否达标
 public class StudentStandardDto {
 
+    private Long courseScheduleId;
+
     private Integer userId;
 
     private Integer courseScheduleReviewId;
@@ -21,6 +23,14 @@ public class StudentStandardDto {
 
     private Long studentAttendanceId;
 
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
     public Long getStudentAttendanceId() {
         return studentAttendanceId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/QuestionnaireTopic.java

@@ -29,7 +29,7 @@ public class QuestionnaireTopic extends BaseEntity {
 	/** 是否需要登录（1是0否） */
 	private Integer loginFlag = 1;
 
-	/** 是否逐题提交） */
+	/** 是否逐题提交（1逐题0一起提交） */
 	private Integer commitType = 1;
 	
 	/**  */

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

@@ -600,6 +600,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrder.setVersion(0);
         studentPaymentOrder.setCalenderId(calenderId);
+        studentPaymentOrder.setOrganId(organId);
+        studentPaymentOrder.setRoutingOrganId(organId);
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         // 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
@@ -635,8 +637,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentPaymentOrder.setBalancePaymentAmount(amount);
                 studentPaymentOrder.setActualAmount(new BigDecimal(0));
                 studentPaymentOrder.setUpdateTime(date);
-                studentPaymentOrder.setOrganId(organId);
-                studentPaymentOrder.setRoutingOrganId(organId);
                 studentPaymentOrderService.update(studentPaymentOrder);
                 sysUserCashAccountService.updateBalance(userId, amount.negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "乐团续费");
                 amount = BigDecimal.ZERO;
@@ -852,6 +852,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setPaymentChannel(channelType);
         studentPaymentOrder.setMusicGroupId(studentRegistration.getMusicGroupId());
         studentPaymentOrder.setCalenderId(calenderId);
+        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(musicGroup.getOrganId());
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         // 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
@@ -891,8 +893,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setRemitFee(goodsDto.getRemitFee());
         studentPaymentOrder.setCourseRemitFee(goodsDto.getCourseRemitFee());
-        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-        studentPaymentOrder.setRoutingOrganId(musicGroup.getOrganId());
         studentPaymentOrder.setUpdateTime(date);
 
         if ("205".equals(studentPaymentOrder.getPaymentAccountNo())) {

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

@@ -3971,6 +3971,7 @@
         WHERE sa.id_ IS NOT NULL AND sa.course_schedule_id_ = #{courseScheduleId}
     </select>
     <resultMap id="StudentStandardDto" type="com.ym.mec.biz.dal.dto.StudentStandardDto">
+        <result property="courseScheduleId" column="course_schedule_id_"/>
         <result property="qualifiedFlag" column="qualified_flag_"/>
         <result property="userId" column="user_id_"/>
         <result property="avatar" column="avatar_"/>
@@ -3999,7 +4000,7 @@
     </select>
     <select id="queryStudyStandardWaitVisit" resultMap="StudentStandardDto">
         SELECT su.avatar_,s.user_id_,su.username_,cs.class_date_,sb.name_ subject_name_,
-               su.phone_,csr.id_ course_schedule_review_id_,sa.id_ student_attendance_id_
+               su.phone_,csr.id_ course_schedule_review_id_,sa.id_ student_attendance_id_,cs.id_ course_schedule_id_
         FROM course_schedule cs
         LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
         LEFT JOIN course_schedule_review csr ON csr.course_schedule_id_ = cs.id_
@@ -4009,6 +4010,12 @@
         LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         WHERE csts.user_id_ = #{teacherId} AND cs.evaluate_flag_ = 1 AND sa.qualified_flag_ = 0 AND sv.id_ IS NULL
+        <if test="startTime != null and startTime != ''">
+            AND cs.class_date_ >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND cs.class_date_ &lt;= #{endTime}
+        </if>
         ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>