fix 导出记录

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -176,7 +176,6 @@ public class ClassGradeController extends BaseController {
     @Log(title = "导出学员学时列表", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<UserProfileExportGaiVo> export(ClassGradeUserQueryBo bo) {
-
         String fileName = "";
         if(Validator.isEmpty(bo.getStudyStatus())){
             bo.setStudyStatus(0);
@@ -192,19 +191,16 @@ public class ClassGradeController extends BaseController {
                 fileName="完成学习";
             }
         }
-
-
-        startPage();
         bo.setUserPhoto(1);
-        List<ClassPeriodStudentExportVo> list = iClassGradeUserService.exportPo(bo);
-        ExcelUtil<ClassPeriodStudentExportVo> util = new ExcelUtil<ClassPeriodStudentExportVo>(ClassPeriodStudentExportVo.class);
+        List<ClassPeriodStudentExportAllVo> list = iClassGradeUserService.exportPo(bo);
+        ExcelUtil<ClassPeriodStudentExportAllVo> util = new ExcelUtil<ClassPeriodStudentExportAllVo>(ClassPeriodStudentExportAllVo.class);
         ExportParams deptExportParams = new ExportParams();
         // 设置sheet得名称
         deptExportParams.setSheetName("表1");
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         Map<String, Object> deptExportMap = new HashMap<>();
         deptExportMap.put("title", deptExportParams);
-        deptExportMap.put("entity", ClassPeriodStudentExportVo.class);
+        deptExportMap.put("entity", ClassPeriodStudentExportAllVo.class);
         // sheet中要填充得数据
         deptExportMap.put("data", list);
         List<Map<String, Object>> sheetsList = new ArrayList<>();

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

@@ -56,7 +56,7 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	String pushOfficialPeriodMore(List<ClassGradeUserQueryBo> list);
 
-	List<ClassPeriodStudentExportVo> exportPo(ClassGradeUserQueryBo bo);
+	List<ClassPeriodStudentExportAllVo> exportPo(ClassGradeUserQueryBo bo);
 
 	/**
 	 * 根据编辑业务对象修改学员记录

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

@@ -398,7 +398,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
             }
         }
-
         classGradeUser1.setUpdateTime(DateUtils.getNowTime());
         iClassGradeUserService.update(classGradeUser1, classGradeUser);
         return gradePeriodStatus;
@@ -664,7 +663,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
 
     @Override
-    public List<ClassPeriodStudentExportVo> exportPo(ClassGradeUserQueryBo bo) {
+    public List<ClassPeriodStudentExportAllVo> exportPo(ClassGradeUserQueryBo bo) {
         //查询班级学员信息
         List<ClassPeriodStudentVo> classPeriodStudentVos = baseMapper.listUserPeriod(bo);
         List<ClassPeriodStudentExportVo> exportList = new ArrayList<>();
@@ -765,7 +764,28 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             addItem.setPeriodVoList(listUserStudyRecord(classGradeUserQueryBo1));
             exportList.add(addItem);
         }
-        return exportList;
+        return fillList(exportList);
+    }
+
+    //填充满列表的用户信息
+    private List<ClassPeriodStudentExportAllVo>  fillList(List<ClassPeriodStudentExportVo> list){
+        List<ClassPeriodStudentExportAllVo> newList = new ArrayList<>();
+        for(ClassPeriodStudentExportVo vo : list){
+            for(UserPeriodExportVo cVo : vo.getPeriodVoList()){
+                ClassPeriodStudentExportAllVo item = BeanUtil.toBean(vo, ClassPeriodStudentExportAllVo.class);
+                item.setId(cVo.getId());
+                item.setModuleName(cVo.getModuleName());
+                item.setChapterName(cVo.getChapterName());
+                item.setSectionName(cVo.getSectionName());
+                item.setDurationTime(cVo.getDurationTime());
+                item.setStudyTimeTxt(cVo.getStudyTimeTxt());
+                item.setStudyTimeLongTxt(cVo.getStudyTimeLongTxt());
+                item.setStudyStatusTxt(cVo.getStudyStatusTxt());
+                item.setScore(cVo.getScore());
+                newList.add(item);
+            }
+        }
+        return newList;
     }
 
     private UserPeriodExportVo mergeData(Long index,String moduleName,String chapterName,String sectionName,ClassPeriodSectionVo classPeriodSectionVo,BigDecimal performance,Boolean isExam){

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

@@ -0,0 +1,91 @@
+package com.zhongzheng.modules.grade.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 学员记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ExcelTarget("classPeriodStudentExportVo")
+public class ClassPeriodStudentExportAllVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 学员编码 */
+	@Excel(name = "学员编码")
+	@ApiModelProperty("学员编码")
+	private String studentCode;
+	/** 学员编码 */
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("学员姓名")
+	private String realName;
+	/** 学员编码 */
+	@Excel(name = "学员身份证")
+	@ApiModelProperty("学员身份证")
+	private String idCard;
+	/** 学员编码 */
+	@Excel(name = "学员电话")
+	@ApiModelProperty("学员电话")
+	private String telPhone;
+	/** 一寸照片 */
+	@Excel(name = "一寸照片")
+	@ApiModelProperty("一寸照片")
+	private String oneInchPhotos;
+	/** 身份证人像照 */
+	@Excel(name = "身份证人像照")
+	@ApiModelProperty("身份证人像照")
+	private String idCardImg1;
+	/** 商品ID */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	/** 学时 */
+	@Excel(name = "学时")
+	@ApiModelProperty("学时")
+	private Long classHours;
+	@Excel(name = "学习有效期")
+	private String studyTimeStr;
+	@Excel(name = "所在班级")
+	private String className;
+	@Excel(name = "班级有效期")
+	private String classTimeStr;
+
+	@Excel(name = "序号")
+	@ApiModelProperty("序号")
+	private Long id;
+
+	@Excel(name = "模块标题")
+	@ApiModelProperty("模块标题")
+	private String moduleName;
+	@Excel(name = "章标题")
+	@ApiModelProperty("章标题")
+	private String chapterName;
+	@Excel(name = "节标题")
+	@ApiModelProperty("节标题")
+	private String sectionName;
+	@Excel(name = "节时长(秒)")
+	@ApiModelProperty("节时长(秒)")
+	private Long durationTime;
+	@Excel(name = "学习/做题时间")
+	@ApiModelProperty("学习/做题时间")
+	private String studyTimeTxt;
+	@Excel(name = "学习/做题时长")
+	@ApiModelProperty("学习/做题时长")
+	private String studyTimeLongTxt;
+	@Excel(name = "学习/做题状态")
+	@ApiModelProperty("学习/做题状态")
+	private String studyStatusTxt;
+	@Excel(name = "测试成绩")
+	@ApiModelProperty("测试成绩")
+	private BigDecimal score;
+}