【工作日志】增加导出，日期转换器。修改错误的sql脚本

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/DateConverter.java → 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<Date> {
+public class EasyExcelDateConverter implements Converter<Date> {
 
     private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd";
 
@@ -44,4 +42,4 @@ public class DateConverter implements Converter<Date> {
         String dateValue = sdf.format(value);
         return new WriteCellData<>(dateValue);
     }
-}
+}

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();
     }
 }

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<WorkdiarySer
     /**
      * 200 一批执行导入
      */
-    public static final Integer BATCH_SIZE = 2;
+    public static final Integer BATCH_SIZE = 200;
 
     /**
      * 数据列表

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql

@@ -8,14 +8,14 @@ CREATE TABLE `workdiary_service_record`
     `GRID_ID` varchar(32) NOT NULL COMMENT '网格ID',
     `ORG_ID_PATH` varchar(255) NOT NULL COMMENT '组织ID path',
     `APPLICANT_ID` varchar(32) NOT NULL COMMENT '申请人ID',
-    `APPLICANT_ID_CARD` varchar(32) NOT NULL COMMENT '申请人证件号',
+    `APPLICANT_ID_CARD` varchar(32) default '' COMMENT '申请人证件号',
     `APPLICANT_NAME` varchar(32) NOT NULL COMMENT '申请人姓名',
     `APPLICANT_ADDRESS` varchar(32) NOT NULL COMMENT '申请人住址',
     `APPLICANT_MOBILE` varchar(20) NOT NULL COMMENT '申请人联系电话',
     `SERVICE_CONTENT` varchar(255) NOT NULL COMMENT '服务内容',
     `SERVICE_TIME` datetime NOT NULL COMMENT '服务时间',
-    `PRINCIPAL_NAME` varchar(10) NOT NULL COMMENT '负责人姓名',
-    `REMARK` varchar(255) NOT NULL COMMENT '备注',
+    `PRINCIPAL_NAME` varchar(10) default '' COMMENT '负责人姓名',
+    `REMARK` varchar(255) default '' COMMENT '备注',
     `DEL_FLAG`     int(11)     NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
     `REVISION`     int(11)     NOT NULL COMMENT '乐观锁',
     `CREATED_BY`   varchar(64) NOT NULL COMMENT '创建人',