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

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

@@ -117,6 +117,12 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "作业是否回复",required = false)
     private String homeWorkReplied;
 
+    @ApiModelProperty(value = "学生考勤id",required = false)
+    private Integer attendanceId;
+
+    @ApiModelProperty(value = "考勤Str",required = false)
+    private String attendanceStr;
+
     public Integer getOrganId() {
         return organId;
     }
@@ -412,4 +418,20 @@ public class CourseReviewDto {
     public void setHomeWorkReplied(String homeWorkReplied) {
         this.homeWorkReplied = homeWorkReplied;
     }
+
+    public Integer getAttendanceId() {
+        return attendanceId;
+    }
+
+    public void setAttendanceId(Integer attendanceId) {
+        this.attendanceId = attendanceId;
+    }
+
+    public String getAttendanceStr() {
+        return attendanceStr;
+    }
+
+    public void setAttendanceStr(String attendanceStr) {
+        this.attendanceStr = attendanceStr;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderTypeEnum.java

@@ -12,6 +12,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
 	OTHER("OTHER", "其他"),
 	SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "小课购买"),
 	PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课购买"),
+	PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),
 	COURSE_GROUP_BUY("COURSE_GROUP_BUY","对外课程购买"),
 	LUCK("LUCK", "福袋活动"),
 	TENANT_RECHARGE("TENANT_RECHARGE","租户充值");

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

@@ -47,6 +47,9 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否导出",required = false)
     private Integer isExport;
 
+    @ApiModelProperty(value = "是否到课",required = false)
+    private Integer hasArrived;
+
     public Integer getTeacherId() {
         return teacherId;
     }
@@ -152,4 +155,12 @@ public class CourseReviewQueryInfo extends QueryInfo {
     public void setIsExport(Integer isExport) {
         this.isExport = isExport;
     }
+
+    public Integer getHasArrived() {
+        return hasArrived;
+    }
+
+    public void setHasArrived(Integer hasArrived) {
+        this.hasArrived = hasArrived;
+    }
 }

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

@@ -414,6 +414,9 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setType(OrderTypeEnum.PRACTICE_GROUP_BUY);
+        if(practiceGroupBuyParams.isRenew()){
+            studentPaymentOrder.setType(OrderTypeEnum.PRACTICE_GROUP_RENEW);
+        }
         studentPaymentOrder.setExpectAmount(amount);
         studentPaymentOrder.setMusicGroupId(practiceGroupBuyParams.getId().toString());
         studentPaymentOrder.setActualAmount(studentPaymentOrder.getExpectAmount());

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

@@ -2946,6 +2946,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setType(OrderTypeEnum.PRACTICE_GROUP_BUY);
+        if(practiceGroupBuyParams.isRenew()){
+            studentPaymentOrder.setType(OrderTypeEnum.PRACTICE_GROUP_RENEW);
+        }
         studentPaymentOrder.setExpectAmount(amount);
         studentPaymentOrder.setMusicGroupId(practiceGroupBuyParams.getId().toString());
         studentPaymentOrder.setActualAmount(studentPaymentOrder.getExpectAmount());

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

@@ -155,6 +155,7 @@
         <result column="has_liaison_" property="hasLiaison"/>
         <result column="student_id_" property="studentId"/>
         <result column="home_work_replied_" property="homeWorkReplied"/>
+        <result column="attendance_id_" property="attendanceId"/>
     </resultMap>
 
     <sql id="practiceGroupReviewsQueryCondition">
@@ -212,6 +213,12 @@
             <if test="endTime !=null">
                 <![CDATA[AND cs.class_date_ <= #{endTime} ]]>
             </if>
+            <if test='hasArrived !=null and hasArrived=="1"'>
+                AND sa.id_ > 0
+            </if>
+            <if test='hasArrived !=null and hasArrived=="0"'>
+                AND sa.id_ IS NULL
+            </if>
         </where>
     </sql>
 
@@ -221,7 +228,7 @@
         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_
+        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>
@@ -231,6 +238,7 @@
         LEFT JOIN sys_user edsu ON pg.educational_teacher_id_ = edsu.id_
         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>
@@ -244,6 +252,7 @@
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         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_
         <include refid="practiceGroupReviewsQueryCondition"/>
     </select>
 

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

@@ -76,7 +76,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出对外订单列表")
     @PostMapping("export/tenantPaymentOrder")
     @PreAuthorize("@pcs.hasPermissions('export/tenantPaymentOrder')")
-    public void tenantPaymentOrder(HttpServletResponse response,TenantPaymentOrderQueryInfo queryInfo) {
+    public void tenantPaymentOrder(HttpServletResponse response, TenantPaymentOrderQueryInfo queryInfo) {
         queryInfo.setRows(49999);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -682,13 +682,18 @@ public class ExportController extends BaseController {
                     row.setHomeWorkReplied("已回复");
                 } else if (row.getHandHomework() != null && row.getHandHomework() > 0) {
                     row.setHomeWorkReplied("未回复");
-                }else {
+                } else {
                     row.setHomeWorkReplied(null);
                 }
+                if (row.getAttendanceId() != null) {
+                    row.setAttendanceStr("是");
+                } else {
+                    row.setAttendanceStr("否");
+                }
             }
 
-            String[] header = {"分部", "上课日期", "学生编号","课程编号", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业","是否回复作业", "教务老师", "教务评价"};
-            String[] body = {"organName", "classDateStr", "studentId","id", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr","homeWorkReplied", "eduTeacherName", "courseReview"};
+            String[] header = {"分部", "上课日期", "学生编号", "课程编号", "学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
+            String[] body = {"organName", "classDateStr", "studentId", "id", "attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "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");