修改订单记录

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

@@ -36,10 +36,15 @@ public class GoodsPeriodStatusVo {
 	private Long type;
 
 	/** 1 节 2卷 */
-	@Excel(name = "1 节 2卷")
-	@ApiModelProperty("1 节 2卷")
+	@Excel(name = "")
+	@ApiModelProperty("学时记录ID")
 	private Long periodId;
 
+	/** 1 节 2卷 */
+	@Excel(name = "")
+	@ApiModelProperty("节类型 1录播 2直播 3回放 0卷")
+	private Long sectionType;
+
 	/** 拍照详情 */
 	@Excel(name = "拍照详情")
 	@ApiModelProperty("拍照详情")

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -156,7 +156,6 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
             InformUserAddBo informUserAddBo = new InformUserAddBo();
             informUserAddBo.setInformId(add.getInformId());
             informUserAddBo.setUserId(userId);
-            informUserAddBo.setUserId(userId);
             informUserAddBo.setCreateTime(DateUtils.getNowTime());
             informUserAddBo.setUpdateTime(DateUtils.getNowTime());
             iInformUserService.insertByAddBo(informUserAddBo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformUserServiceImpl.java

@@ -61,7 +61,14 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
     @Override
     public InformUserVo queryById(Long id){
         InformUser db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, InformUserVo.class);
+        InformUserVo informUserVo = BeanUtil.toBean(db, InformUserVo.class);
+        if (informUserVo.getSystemStatus() == 2) {
+            InformVo informVo = informService.queryById(informUserVo.getInformId());
+            informVo.setInformExamVo(iInformExamService.queryExam(informVo.getInformId()));
+            informVo.setInformCourseVo(iInformCourseService.queryCourse(informVo.getInformId()));
+            informUserVo.setInformVo(informVo);
+        }
+        return informUserVo;
     }
 
     @Override

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

@@ -107,6 +107,7 @@
         <result property="type" column="type"/>
         <result property="name" column="name"/>
         <result property="periodId" column="period_id"/>
+        <result property="sectionType" column="section_type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsUserVo" id="GoodsUserVo">
@@ -362,7 +363,8 @@
             ups.id,
             ups.period_id,
             cs.`name`,
-            1 as type
+            1 as type,
+               cs.section_type as section_type
         FROM
             user_period up
                 LEFT JOIN user_period_status ups ON up.id = ups.period_id
@@ -379,7 +381,8 @@
             ups.id,
             ups.period_id,
             exam_name as name,
-            2 as type
+            2 as type,
+               0 as  section_type
         FROM
             user_period up
                 LEFT JOIN user_period_status ups ON up.id = ups.period_id