预警导出 发布时间

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<EarlyWarningEO> {
 //            List<StandWarningEO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
             List<WarningExportVO> 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);

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)
+//    @ExcelProperty(value = "发布日期",index = 6)
-    @ColumnWidth(20)
+//    @ColumnWidth(20)
     @ApiModelProperty("发布日期")
     @TableField(exist = false)
     @DateTimeFormat(pattern="yyyy-MM-dd")

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;
+
 
 }

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