fix 模板编辑

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

@@ -293,4 +293,29 @@ public class GoodsUserVo {
 	private Long profileStatus;
 	@ApiModelProperty("资料审核模板  1有 0没有")
 	private Long profileTpStatus;
+
+	/** 0 待登记 1正常 2缺考 3作弊 4替考 */
+	@Excel(name = "0 待登记 1正常 2缺考 3作弊 4替考")
+	@ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+	private Integer subExamStatus;
+	/** 成绩 */
+	@Excel(name = "成绩")
+	@ApiModelProperty("成绩")
+	private Long subPerformance;
+	/** 1通过 0不通过 */
+	@Excel(name = "1通过 0不通过")
+	@ApiModelProperty("1通过 0不通过")
+	private Integer subResult;
+	/** 考试开始时间段 */
+	@Excel(name = "考试开始时间段")
+	@ApiModelProperty("考试开始时间段")
+	private String subApplySiteStartTime;
+	/** 考试结束时间段 */
+	@Excel(name = "考试结束时间段")
+	@ApiModelProperty("考试结束时间段")
+	private String subaApplySiteEndTime;
+	/** 考试日期 */
+	@Excel(name = "考试日期")
+	@ApiModelProperty("考试日期")
+	private Long subApplySiteExamTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -556,8 +556,12 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         informQueryBo.setIssueStatus(2);
         List<InformVo> informVos = informService.listInform(informQueryBo);
         for (InformVo informVo : informVos) {
+            List<Integer> statusList = new ArrayList<>();
+            statusList.add(0);
+            statusList.add(2);
             LambdaQueryWrapper<InformUser> lqw = Wrappers.lambdaQuery();
             lqw.eq(InformUser::getInformId, informVo.getInformId());
+            lqw.in(InformUser::getSendStatus,statusList);
             InformUser informUser = new InformUser();
             informUser.setSendTime(DateUtils.getNowTime());
             informUser.setSendStatus(1);

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

@@ -172,6 +172,13 @@
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="profileStatus" column="profile_status"/>
         <result property="profileTpStatus" column="profile_tp_status"/>
+
+        <result property="subExamStatus" column="sub_exam_status"/>
+        <result property="subPerformance" column="sub_performance"/>
+        <result property="subResult" column="sub_result"/>
+        <result property="subApplySiteStartTime" column="sub_apply_site_start_time"/>
+        <result property="subApplySiteEndTime" column="sub_apply_site_end_time"/>
+        <result property="subApplySiteExamTime" column="sub_apply_site_exam_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
@@ -452,6 +459,15 @@
         (SELECT eb.before_name FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = g.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) as before_name,
         (SELECT `status` from user_profile where user_id = o.user_id and goods_id = g.goods_id and current_status = 1 and type_status = 1 limit 1 ) as profile_status,
         (case WHEN(SELECT COUNT(1) from profile_tp where `status`=1 and FIND_IN_SET(g.goods_id,goods_ids) ) >0 then 1 ELSE 0 end) as profile_tp_status
+        <if test="userId != null and userId != ''">
+        ,
+        (SELECT exam_status from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_exam_status,
+        (SELECT performance from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_performance,
+        (SELECT `result` from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_result,
+        (SELECT apply_site_start_time from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_start_time,
+        (SELECT apply_site_end_time from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_end_time,
+        (SELECT apply_site_exam_time from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_exam_time
+        </if>
         FROM
         `order` o
         LEFT JOIN order_goods og ON og.order_sn = o.order_sn