he2802 1 rok pred
rodič
commit
ac2396cb92

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

@@ -4376,7 +4376,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             DangAnCertificateExportVo item = BeanUtil.toBean(vo, DangAnCertificateExportVo.class);
             item.setTrainTimeTxt(DateUtils.timestampToDateFormat(vo.getTrainStartTime(),"yyyy-MM-dd HH:mm:ss")+"至"+DateUtils.timestampToDateFormat(vo.getTrainEndTime(),"yyyy-MM-dd HH:mm:ss"));
             item.setBusinessName(vo.getEducationName()+"-"+vo.getProjectName()+"-"+vo.getBusinessName());
-            item.setClassHours(vo.getClassHours()+"");
+            item.setClassHours(vo.getClassHours().add(vo.getPublicClassHours())+"");
             exportList.add(item);
             String imgDirPath = dirPath+"/"+vo.getCertificateCode();
             File dir = new File(imgDirPath);

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentExportListVo.java

@@ -57,7 +57,7 @@ public class ClassPeriodStudentExportListVo {
 	@Excel(name = "总进度(节)")
 	private String process;
 
-	@Excel(name = "视频总进度")
+
 	private String videoProcess;
 
 	@Excel(name = "学时审核")