Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1101,6 +1101,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             exportVo.setExamStr(classGradeStudentVo.getRecordNum() + "/" + classGradeStudentVo.getExamNum());
             exportVo.setStudyStartStr(DateUtils.timestampToDateFormat(classGradeStudentVo.getStartTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
             exportVo.setStudyEndStr(DateUtils.timestampToDateFormat(classGradeStudentVo.getEndTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
+            exportVo.setOrderTime(DateUtils.timestampToDateFormat(classGradeStudentVo.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
             if (classGradeStudentVo.getPeriodStatus() == -1 || classGradeStudentVo.getPeriodStatus() == 0) {
                 exportVo.setStudyStatusStr("未学完");
             } else {

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentAllExportVo.java

@@ -42,6 +42,9 @@ public class ClassGradeStudentAllExportVo {
 	@Excel(name = "工作单位")
 	private String companyName;
 
+	@Excel(name = "订单时间")
+	private String orderTime;
+
 	@ApiModelProperty("班级名称")
 	@Excel(name = "班级名称")
 	private String gradeName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -94,6 +94,8 @@ public class ClassGradeStudentVo {
 	@ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
 	private Long learnStatus;
 
+	@ApiModelProperty("订单时间")
+	private Long createTime;
 
 	/** 学习进度 */
 	@ApiModelProperty("已学节数")

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationName" column="education_name"/>
         <result property="sevenYear" column="seven_year"/>
         <result property="orgId" column="org_id"/>
-
+        <result property="createTime" column="create_time"/>
         <result property="userBindWx" column="user_bind_wx"/>
         <result property="userFollowWx" column="user_follow_wx"/>
         <result property="useStudyCount" column="use_study_count"/>
@@ -741,6 +741,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.goods_name,
         og.order_sn,
         og.seven_year,
+        og.create_time,
         m.category_name,
         g.major_id,
         u.province,