|
|
@@ -2,6 +2,7 @@ package com.zhongzheng.modules.grade.vo;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.zhongzheng.common.annotation.Excel;
|
|
|
+import com.zhongzheng.common.utils.DateUtils;
|
|
|
import com.zhongzheng.modules.user.vo.UserUpdateVo;
|
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
@@ -148,7 +149,7 @@ public class ClassStudentExportVo implements Serializable {
|
|
|
vo.setPeriodStatusStr(studentVo.getPeriodStatus() == 0 ? "未通过":studentVo.getPeriodStatus() == 1?"通过":"待审核");
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
if (ObjectUtil.isNotNull(studentVo.getServiceStartTime()) && ObjectUtil.isNotNull(studentVo.getServiceEndTime())){
|
|
|
- vo.setServiceDateStr(sdf.format(new Date(studentVo.getServiceStartTime()))+"至"+sdf.format(new Date(studentVo.getServiceEndTime())));
|
|
|
+ vo.setServiceDateStr(DateUtils.timestampToDate(studentVo.getServiceStartTime())+"至"+DateUtils.timestampToDate(studentVo.getServiceEndTime()));
|
|
|
}
|
|
|
if (ObjectUtil.isNotNull(studentVo.getClassStartTime()) && ObjectUtil.isNotNull(studentVo.getClassEndTime())){
|
|
|
vo.setClassDateStr(sdf.format(new Date(studentVo.getClassStartTime()))+"至"+sdf.format(new Date(studentVo.getClassEndTime())));
|
he2802