From 811b691b271c1b21702e8490283646c19c49a4ce Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 21 Apr 2023 09:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 3 --- .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 6 +++--- .../da/slrs/sarStandWarning/entity/WarningExportVO.java | 8 -------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 562ae8c0..410ef91f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -152,9 +152,6 @@ public class EarlyWarningEOController extends BaseController { // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); for (WarningExportVO warningExportVO : exportExcel){ - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String format = simpleDateFormat.format(warningExportVO.getPutTime()); - warningExportVO.setPutTimeStr(format); String condition = warningExportVO.getTermsConditions(); if (condition != null && condition.length() > 32001){ condition = condition.substring(0,32000); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index a170c029..2d8847eb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -60,12 +60,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standName; -// @ExcelProperty(value = "发布日期",index = 6) -// @ColumnWidth(20) + @ExcelProperty(value = "发布日期",index = 6) + @ColumnWidth(20) @ApiModelProperty("发布日期") @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") - private Date putTime; + private String putTime; @ExcelIgnore @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java index 5c2bb2a9..daca4827 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -39,12 +39,4 @@ public class WarningExportVO extends EarlyWarningEO { @ApiModelProperty("适用车型展示") private String applyTypeShow; - @ExcelProperty(value = "发布日期",index = 6) - @ColumnWidth(20) - @ApiModelProperty("发布日期") - @TableField(exist = false) - @DateTimeFormat(pattern="yyyy-MM-dd") - private String putTimeStr; - - }