From ef161352e58dab2b1d294cbcedb26572594d337e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Aug 2022 17:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=BD=AC=E6=8D=A2=E5=99=A8=E3=80=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erter.java => EasyExcelDateConverter.java} | 6 ++---- .../excel/WorkdiaryServiceRecordExcel.java | 19 +++---------------- .../WorkdiaryServiceImportListener.java | 2 +- .../migration/V0.0.28__workdiary_service.sql | 6 +++--- 4 files changed, 9 insertions(+), 24 deletions(-) rename epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/{DateConverter.java => EasyExcelDateConverter.java} (93%) 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