zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CommonOrderInfoVo.java

@@ -54,5 +54,11 @@ public class CommonOrderInfoVo implements Serializable {
     @ApiModelProperty("学习进度")
     private String studySchedule;
 
+    @ApiModelProperty("是否已上传报名记录")
+    private String officialStatus;
+
+    @ApiModelProperty("是否已申请学时")
+    private String periodPlush;
+
 
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -1002,6 +1002,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN cg.class_status = 1 THEN '已开班'
                 WHEN cg.class_status = 0 THEN '未开班'
                 ELSE '其他' END AS classStatus,
+            CASE
+            WHEN cgu.official_status = 1 THEN '是'
+            ELSE '否' END AS officialStatus,
+            CASE
+            WHEN cgu.period_plush = 1 THEN '是'
+            ELSE '否' END AS periodPlush,
             FROM_UNIXTIME( cg.class_end_time, '%Y-%m-%d %H:%i:%s' ) AS classEndTime,
             CONCAT((
                 ((SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.report_status=1 and ubr.grade_id = og.grade_id and ubr.order_goods_id = og.order_goods_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) +