fix

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

@@ -4430,7 +4430,7 @@ 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.getSectionNum());
             item.setVideoProcess(vo.getStuAllNum()+"/"+vo.getSectionNum());
-            if(Validator.isNotEmpty(vo.getGoodsStatus())&&vo.getGoodsStatus()==1){
+            if(Validator.isNotEmpty(vo.getStatus())&&vo.getStatus()==1){
                 item.setStatus("正常");
             }else{
                 item.setStatus("无效");
@@ -4513,6 +4513,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             DangAnHandoutsListExportVo item = BeanUtil.toBean(vo, DangAnHandoutsListExportVo.class);
             item.setBusinessName(vo.getEducationName()+"-"+vo.getProjectName()+"-"+vo.getBusinessName());
             item.setServiceTimeTxt(DateUtils.timestampToDateFormat(vo.getServiceStartTime(),"yyyy-MM-dd HH:mm:ss")+"至"+DateUtils.timestampToDateFormat(vo.getServiceEndTime(),"yyyy-MM-dd HH:mm:ss"));
+            if(Validator.isNotEmpty(vo.getStatus())&&vo.getStatus()==1){
+                item.setStatus("正常");
+            }else{
+                item.setStatus("无效");
+            }
             exportList.add(item);
         }
         ExcelUtil<DangAnHandoutsListExportVo> util = new ExcelUtil<DangAnHandoutsListExportVo>(DangAnHandoutsListExportVo.class);

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

@@ -819,6 +819,7 @@
         s.service_start_time,
         s.service_end_time,
         s.order_goods_id,
+        ( SELECT e.education_name FROM course_education_type e WHERE e.id = g.education_type_id LIMIT 1) AS education_name,
         ( SELECT m.category_name FROM major m WHERE   m.id =g.major_id LIMIT 1) AS category_name,
         ( SELECT i.business_name FROM course_business i WHERE i.id = g.business_id LIMIT 1) AS business_name,
         ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.project_id LIMIT 1) AS project_name,