Merge remote-tracking branch 'origin/master'

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

@@ -50,6 +50,9 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否到课",required = false)
     private Integer hasArrived;
 
+    @ApiModelProperty(value = "作业是否回复",required = false)
+    private Integer homeWorkReplied;
+
     public Integer getTeacherId() {
         return teacherId;
     }
@@ -163,4 +166,12 @@ public class CourseReviewQueryInfo extends QueryInfo {
     public void setHasArrived(Integer hasArrived) {
         this.hasArrived = hasArrived;
     }
+
+    public Integer getHomeWorkReplied() {
+        return homeWorkReplied;
+    }
+
+    public void setHomeWorkReplied(Integer homeWorkReplied) {
+        this.homeWorkReplied = homeWorkReplied;
+    }
 }

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

@@ -195,7 +195,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 e.setAccessoriesAmount(accessoriesAmountMap.get(e.getPaymentOrderId()));
                 e.setOrderAmount(actualAmountMap.get(e.getPaymentOrderId()));
                 e.setCourseAmount(courseAmountMap.get(e.getPaymentOrderId()));
-                e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getUserId())));
+                String s = purchaseTypeMap.get(e.getUserId());
+                if(StringUtils.isNotEmpty(s)){
+                    e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getUserId())));
+                }
             });
         }
         return musicalListDetailDtos;

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

@@ -219,6 +219,12 @@
             <if test='hasArrived !=null and hasArrived=="0"'>
                 AND sa.id_ IS NULL
             </if>
+            <if test='homeWorkReplied !=null and homeWorkReplied =="1"'>
+                AND sch.is_replied_ > 0
+            </if>
+            <if test='homeWorkReplied !=null and homeWorkReplied =="0"'>
+                AND (sch.is_replied_ = 0 OR sch.is_replied_ IS NULL)
+            </if>
         </where>
     </sql>
 
@@ -228,10 +234,8 @@
         teacher_name_,edsu.real_name_
         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.create_time_,csr.update_time_,sa.id_ attendance_id_
-        <if test='isExport !=null and isExport=="1"'>
-            ,sch.is_replied_ home_work_replied_
-        </if>
+        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.create_time_,csr.update_time_,sa.id_
+        attendance_id_,sch.is_replied_ home_work_replied_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
@@ -239,9 +243,7 @@
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
         LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
         LEFT JOIN student_attendance sa on sa.course_schedule_id_ = cs.id_
-        <if test='isExport !=null and isExport=="1"'>
-            LEFT JOIN student_course_homework sch on cs.id_ = sch.course_schedule_id_
-        </if>
+        LEFT JOIN student_course_homework sch on cs.id_ = sch.course_schedule_id_
         <include refid="practiceGroupReviewsQueryCondition"/>
         ORDER BY cs.class_date_ DESC
         <include refid="global.limit"/>
@@ -253,6 +255,7 @@
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
         LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
         LEFT JOIN student_attendance sa on sa.course_schedule_id_ = cs.id_
+        LEFT JOIN student_course_homework sch on cs.id_ = sch.course_schedule_id_
         <include refid="practiceGroupReviewsQueryCondition"/>
     </select>
 
@@ -338,7 +341,7 @@
         FROM course_schedule
         WHERE class_group_id_ = #{classGroupId}
           AND status_ = 'OVER'
-        ORDER BY class_date_ DESC,start_class_time_ DESC
+        ORDER BY class_date_ DESC, start_class_time_ DESC
     </select>
 
     <select id="findByCourseScheduleId" resultMap="CourseScheduleReview">

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

@@ -348,6 +348,9 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('order/musicalListExport')")
     public void musicalListExport(HttpServletResponse response, String musicGroupId) {
         List<Goods> musicalList = studentPaymentOrderDetailService.getMusicalList(musicGroupId);
+        if(musicalList == null){
+            throw new BizException("数据集为空");
+        }
         if (musicalList.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }