fix

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

@@ -4505,6 +4505,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             item.setServiceTimeTxt(DateUtils.timestampToDateFormat(vo.getServiceStartTime(),"yyyy-MM-dd HH:mm:ss")+"至"+DateUtils.timestampToDateFormat(vo.getServiceEndTime(),"yyyy-MM-dd HH:mm:ss"));
             item.setProcess(vo.getStuAllNum()+"/"+vo.getExamNum());
             item.setStudyTimeTxt(DateUtils.timestampToDateFormat(vo.getStartTime(),"yyyy-MM-dd HH:mm:ss")+"至"+DateUtils.timestampToDateFormat(vo.getEndTime(),"yyyy-MM-dd HH:mm:ss"));
+            if(Validator.isNotEmpty(vo.getStatus())&&vo.getStatus()==1){
+                item.setStatus("有效");
+            }else{
+                item.setStatus("无效");
+            }
             exportList.add(item);
         }
         ExcelUtil<DangAnExamListExportVo> util = new ExcelUtil<DangAnExamListExportVo>(DangAnExamListExportVo.class);

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

@@ -42,10 +42,13 @@ public class DangAnExamListExportVo {
 	@Excel(name = "状态")
 	private String status;
 
+	@Excel(name = "模块卷")
 	@ApiModelProperty("模块卷")
 	private Long moduleExamNum;
+	@Excel(name = "章卷")
 	@ApiModelProperty("章卷")
 	private Long chapterExamNum;
+	@Excel(name = "试卷")
 	@ApiModelProperty("试卷")
 	private Long examNum;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/ExamStudyRecordVo.java

@@ -122,4 +122,6 @@ public class ExamStudyRecordVo {
     private String realname;
     @ApiModelProperty("身份证")
     private String idCard;
+    @ApiModelProperty("状态")
+    private Integer goodsStatus;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -131,6 +131,7 @@
         <result property="fileNum" column="file_num"/>
         <result property="realname" column="realname"/>
         <result property="idCard" column="id_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
+        <result property="goodsStatus" column="goods_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.ExamSonStudyRecordVo" id="ExamSonStudyRecordVoResult">
@@ -743,6 +744,7 @@
         g.class_hours,
         g.study_start_time,
         g.study_end_time,
+        g.status as goods_status,
         s.service_start_time,
         s.service_end_time,
         s.order_goods_id,