diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java similarity index 93% rename from epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java index 6fae39280d..74196eb43f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java @@ -17,14 +17,12 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; import java.text.SimpleDateFormat; import java.util.Date; -package com.lxj.common.convert; - /** * @Author: liujianjun * @Date: 2022/7/19 * @Description: yyyy-MM-dd easyExcel 日期转换 */ -public class DateConverter implements Converter { +public class EasyExcelDateConverter implements Converter { private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd"; @@ -44,4 +42,4 @@ public class DateConverter implements Converter { String dateValue = sdf.format(value); return new WriteCellData<>(dateValue); } -} +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 07b2b19797..917fa6f2ce 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -3,12 +3,10 @@ package com.epmet.excel; import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.poi.excel.converter.EasyExcelDateConverter; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -61,10 +59,8 @@ public class WorkdiaryServiceRecordExcel { private String principal; @NotNull(message = "服务时间必填") - @ColumnWidth(10) - @ExcelProperty(value = "服务时间") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ColumnWidth(20) + @ExcelProperty(value = "服务时间", converter = EasyExcelDateConverter.class) private Date serviceTime; @ColumnWidth(20) @@ -73,14 +69,5 @@ public class WorkdiaryServiceRecordExcel { public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { BeanUtil.copyProperties(dto, this); - //this.gridName = dto.getGridName(); - //this.serviceTypeName = dto.getServiceTypeName(); - //this.applicantName = dto.getApplicantName(); - //this.applicantAddress = dto.getApplicantAddress(); - //this.serviceContent = dto.getServiceContent(); - //this.applicantMobile = dto.getApplicantMobile(); - //this.principal = dto.getPrincipalName(); - //this.serviceTime = dto.getServiceTime(); - //this.remark = dto.getRemark(); } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java index bc09d401d0..1adb672911 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/listener/WorkdiaryServiceImportListener.java @@ -19,7 +19,7 @@ public class WorkdiaryServiceImportListener implements ReadListener