fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -143,5 +143,8 @@ public class CourseQueryBo extends BaseEntity {
 	@ApiModelProperty("查询标识：1 PC学习列表")
 	private Integer querySign;
 
+	@ApiModelProperty("学习是否完成 1完成 2未学完")
+	private Integer studyFinishStatus;
+
 	private List<Long> orderGoodsIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -438,4 +438,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("学习结束时间")
 	private Long endTime;
+
+	@ApiModelProperty("商品开通时间")
+	private Long openGoodsTime;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -219,6 +219,7 @@
         <result property="telPhone" column="telphone" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
+        <result property="openGoodsTime" column="open_goods_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
@@ -598,6 +599,7 @@
         og.order_goods_id,
         og.grade_id,
         IFNULL(ge.exam_num,0) as exam_num,
+        og.create_time as open_goods_time,
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.`type` in (1,3) and ubr.report_status=1 and ubr.grade_id = og.grade_id and ubr.user_id = o.user_id and ubr.current_status = 1) as record_num,
         (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) as end_time
         FROM
@@ -660,6 +662,12 @@
         <if test="oldOrderSn != null and oldOrderSn != ''">
             AND (select count(*) from order_input oi where oi.old_order_sn = #{oldOrderSn} AND oi.input_order_sn = o.input_order_sn) >0
         </if>
+        <if test="studyFinishStatus != null and studyFinishStatus == 1">
+            AND (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) >0
+        </if>
+        <if test="studyFinishStatus != null and studyFinishStatus == 2">
+            AND (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) is null 
+        </if>
         order by og.create_time desc
     </select>