From 3061dd45368dbefba581bec6336bfdb8509f74f2 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 14:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 4 ++++ .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 4 ++-- .../slrs/sarStandWarning/entity/WarningExportVO.java | 10 ++++++++++ .../mapper/sarStandWarning/EarlyWraningEOMapper.xml | 2 ++ 4 files changed, 18 insertions(+), 2 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 f66ba43d..562ae8c0 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 @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.*; @RestController @@ -151,6 +152,9 @@ 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 152c60d9..a170c029 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,8 +60,8 @@ 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") 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 e3041f7d..5c2bb2a9 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 @@ -5,6 +5,9 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @Data public class WarningExportVO extends EarlyWarningEO { @@ -36,5 +39,12 @@ 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; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 67421bb3..40e662ea 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -111,6 +111,7 @@ POWER, attr.XCXSSRQ AS XCXSSRQ , attr.ZCCSSRQ AS ZCCSSRQ + ,sarInfo.ISSUE_TIME As putTime FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID @@ -147,6 +148,7 @@ POWER, items.XCXSSRQ AS XCXSSRQ , items.ZCCSSRQ AS ZCCSSRQ + ,sarInfo.ISSUE_TIME As putTime FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID