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 987beea9..f66ba43d 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 @@ -150,7 +150,13 @@ public class EarlyWarningEOController extends BaseController { // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - + for (WarningExportVO warningExportVO : exportExcel){ + String condition = warningExportVO.getTermsConditions(); + if (condition != null && condition.length() > 32001){ + condition = condition.substring(0,32000); + warningExportVO.setTermsConditions(condition); + } + } // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") 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 65e8ae2e..152c60d9 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,7 +60,7 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standName; - @ExcelProperty(value = "发布日期",index = 5) + @ExcelProperty(value = "发布日期",index = 6) @ColumnWidth(20) @ApiModelProperty("发布日期") @TableField(exist = false) @@ -98,6 +98,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsName; + @ExcelProperty(value = "条款内容",index = 5) + @ColumnWidth(60) + @ApiModelProperty("条款内容") + @TableField(exist = false) + private String termsConditions; + @ExcelIgnore @TableField("POLICY_ID") private String policyId; 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 db2f7b95..e3041f7d 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 @@ -11,18 +11,18 @@ public class WarningExportVO extends EarlyWarningEO { - @ExcelProperty(value = "实施日期",index = 6) + @ExcelProperty(value = "实施日期",index = 7) @ColumnWidth(20) @ApiModelProperty("实施日期") private String SSRQ; - @ExcelProperty(value = "新车型实施日期",index = 7) + @ExcelProperty(value = "新车型实施日期",index = 8) @ColumnWidth(20) @ApiModelProperty("新车型实施日期") private String XCXSSRQ; - @ExcelProperty(value = "在产车实施日期",index = 8) + @ExcelProperty(value = "在产车实施日期",index = 9) @ColumnWidth(20) @ApiModelProperty("在产车实施日期") private String ZCCSSRQ; @@ -31,7 +31,7 @@ public class WarningExportVO extends EarlyWarningEO { @ApiModelProperty("标准类别显示") private String standTypeShow; - @ExcelProperty(value = "适用车型",index = 9) + @ExcelProperty(value = "适用车型",index = 10) @ColumnWidth(20) @ApiModelProperty("适用车型展示") private String applyTypeShow;