商品新增

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

@@ -223,6 +223,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
+                                classPeriodSectionVo.setGoodsId(bo.getGoodsId());
                             }else {
                                 UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
                                 userPeriodQueryBo.setExamId(classPeriodSectionVo.getId());
@@ -245,6 +246,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
+                                classPeriodSectionVo.setGoodsId(bo.getGoodsId());
                             }
                         }
 
@@ -277,6 +279,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     }
                     classPeriodSectionVo.setModuleId(0L);
                     classPeriodSectionVo.setChapterId(classPeriodVo.getId());
+                    classPeriodSectionVo.setGoodsId(bo.getGoodsId());
                 }
                 List<ClassPeriodSectionVo> classPeriodSectionVos1 = baseMapper.listPeriodSectionExam(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos1) {
@@ -301,6 +304,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     }
                     classPeriodSectionVo.setModuleId(0L);
                     classPeriodSectionVo.setChapterId(classPeriodVo.getId());
+                    classPeriodSectionVo.setGoodsId(bo.getGoodsId());
                 }
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
@@ -311,7 +315,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 userPeriodQueryBo.setCourseId(classPeriodVo.getCourseId());
                 userPeriodQueryBo.setGoodsId(bo.getGoodsId());
                 userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
-                userPeriodQueryBo.setChapterId(classPeriodVo.getId());
+                userPeriodQueryBo.setChapterId(0L);
                 userPeriodQueryBo.setModuleId(0L);
                 List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
                 if (!CollectionUtils.isEmpty(userPeriodStatusVos)){
@@ -327,6 +331,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
                 classPeriodVo.setModuleId(0L);
                 classPeriodVo.setChapterId(0L);
+                classPeriodVo.setGoodsId(bo.getGoodsId());
                 classPeriodVo.setUserPeriodStatusVos(userPeriodStatusVos);
             }
 

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

@@ -38,6 +38,10 @@ public class ClassPeriodSectionVo {
 	@ApiModelProperty("章ID")
 	private Long chapterId;
 
+	/** 商品ID */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+
 	/** 模塊ID */
 	@ApiModelProperty("模塊ID")
 	private Long moduleId;

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

@@ -42,6 +42,10 @@ public class ClassPeriodVo {
 	@ApiModelProperty("模塊ID")
 	private Long moduleId;
 
+	/** 商品ID */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+
 	/** 標題 */
 	@Excel(name = "標題")
 	@ApiModelProperty("標題")

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

@@ -332,81 +332,7 @@
         ) as user_id,
         (SELECT cs.`name` FROM course_section cs where cm.menu_id = cs.section_id) as type_name,
         null as class_hours,
-        3 as type,
-        (
-        SELECT
-        ups.record_start_time
-        FROM
-        user_period_status ups
-        LEFT JOIN user_period up ON up.id = ups.period_id
-        WHERE
-        period_status = 1
-        AND up.course_id = gc.course_id
-        <if test="goodsId != null and goodsId !='' ">
-            AND up.goods_id = #{goodsId}
-        </if>
-
-        AND up.section_id = cm.menu_id
-
-        ) AS study_start_time,
-        (
-        SELECT
-        ups.record_end_time
-        FROM
-        user_period_status ups
-        LEFT JOIN user_period up ON up.id = ups.period_id
-        WHERE
-        period_status = 1
-
-            AND up.course_id = gc.course_id
-
-        <if test="goodsId != null and goodsId !='' ">
-            AND up.goods_id = #{goodsId}
-        </if>
-        AND up.section_id = cm.menu_id
-        ) AS study_end_time,
-        (
-        SELECT
-        ups.`status`
-        FROM
-        user_period_status ups
-        LEFT JOIN user_period up ON up.id = ups.period_id
-        WHERE
-        period_status = 1
-        AND up.course_id = gc.course_id
-        <if test="goodsId != null and goodsId !='' ">
-            AND up.goods_id = #{goodsId}
-        </if>
-        AND up.section_id = cm.menu_id
-        ) AS STATUS,
-        (
-        SELECT
-        ups.create_time
-        FROM
-        user_period_status ups
-        LEFT JOIN user_period up ON up.id = ups.period_id
-        WHERE
-        period_status = 1
-        AND up.course_id = gc.course_id
-        <if test="goodsId != null and goodsId !='' ">
-            AND up.goods_id = #{goodsId}
-        </if>
-        AND up.section_id = cm.menu_id
-        ) AS audit_time,
-        (
-        SELECT
-        COUNT( ups.id )
-        FROM
-        user_period_status ups
-        LEFT JOIN user_period up ON up.id = ups.period_id
-        WHERE
-        period_status = 1
-        AND up.course_id = gc.course_id
-        <if test="goodsId != null and goodsId !='' ">
-            AND up.goods_id = #{goodsId}
-        </if>
-        AND up.section_id = cm.menu_id
-        ) AS audit_num
+        3 as type
         FROM
         course_menu cm
         LEFT JOIN goods_course gc on gc.course_id = cm.course_id