he2802 2 жил өмнө
parent
commit
64b21caca7

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

@@ -3776,9 +3776,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         List<ClassPeriodStudentExportListVo> exportList = new ArrayList<>();
         for (ClassPeriodStudentVo classPeriodStudentVo : classPeriodStudentVos) {
             ClassPeriodStudentExportListVo vo = BeanUtil.toBean(classPeriodStudentVo, ClassPeriodStudentExportListVo.class);
-            vo.setStudyTime(DateUtils.timestampToDate(classPeriodStudentVo.getStudyStartTime())+"至"+DateUtils.timestampToDate(classPeriodStudentVo.getStudyEndTime()));
+            vo.setStudyTime(DateUtils.timestampToDateFormat(classPeriodStudentVo.getStartTime(),"yyyy-MM-dd HH:mm:ss")+"至"+DateUtils.timestampToDateFormat(classPeriodStudentVo.getEndTime(),"yyyy-MM-dd HH:mm:ss"));
             vo.setProcess((classPeriodStudentVo.getRecordNum()+classPeriodStudentVo.getStuAllNum())+"/"+(classPeriodStudentVo.getExamNum()+classPeriodStudentVo.getSecAllNum()));
             vo.setVideoProcess(classPeriodStudentVo.getStuAllNum()+"/"+classPeriodStudentVo.getSecAllNum());
+            vo.setBusinessName(classPeriodStudentVo.getEducationName()+"-"+classPeriodStudentVo.getProjectName()+"-"+classPeriodStudentVo.getBusinessName());
             if(classPeriodStudentVo.getPeriodStatus()==0){
                 vo.setPeriodStatus("未通过");
             }

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1806,6 +1806,7 @@
         g.code as goods_code,
         g.stand_price,
         g.goods_id,
+        g.year as goods_year,
         cgu.period_status,
         cg.class_start_time,
         cg.class_end_time,