Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherHomeController.java

@@ -163,7 +163,13 @@ public class TeacherHomeController extends BaseController {
                 JSON.parseArray(JSON.toJSONString(teacherHomeStudent), TeacherIndexWrapper.StudentPracticeSummaryExportDto.class);
         DateFormat dateFormat1 = new SimpleDateFormat("yyMMddHHmmss");
         Date date = new Date();
-        String filePath = "/tmp/klx/studentPractice/" + dateFormat1.format(date) + "/"  + studentSearch.getTeacherId() + "_" + System.currentTimeMillis() + ".xlsx";
+        StringBuffer sb = new StringBuffer("/tmp/klx/studentPractice/");
+        sb.append(dateFormat1.format(date)).append("/练习记录")
+                .append(studentSearch.getStartTime()).append("~")
+                .append(studentSearch.getEndTime())
+                .append(studentSearch.getTeacherId()).append("_")
+                .append(System.currentTimeMillis()).append(".xlsx");
+        String filePath = sb.toString();
         File srcFile = new File(filePath);
         File directory = new File(filePath).getParentFile();
         if (!directory.exists()) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/VipCardRecordWrapper.java

@@ -241,6 +241,10 @@ public class VipCardRecordWrapper {
         private Long userId;
 
 
+        @ApiModelProperty("会员类型 VIP,SVIP")
+        private EVipType vipType;
+
+
         @ApiModelProperty("订单号")
         private String orderNo;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/VipCardRecordMapper.xml

@@ -193,6 +193,7 @@
         t.order_no_,
         t.source_type_,
         t.client_type_,
+        t.vip_type_,
         t.create_time_,
         if(t.deduction_by_ is not null, t.deduction_by_, t.create_by_) as operatorId,
         t.type_,