From 12fa95cea9bf5fa61d44a85bf894d7e4f53bfd00 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 15 Jul 2021 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 33 +++++++++++++++---- .../entity/LawsDto.java | 4 +-- .../entity/StandExcelDto.java | 6 +++- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 76a7b537..07469001 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -9,16 +9,13 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; -import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; -import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; -import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -99,7 +96,7 @@ public class SarLawsAttrDetailedListController extends BaseController standExcelDtos = new ArrayList<>(); + for (LawsDto lawsDto:data){ + StandExcelDto standExcelDto = StandExcelDto.builder() + .standNumber(lawsDto.getStandNumber()) + .standName(lawsDto.getStandName()) + .standEnName(lawsDto.getStandEnName()) + .typeApplicable(lawsDto.getTypeApplicable()) + .NYLX(lawsDto.getNYLX()) + .putTime(lawsDto.getPutTime()) + .newCarTime(lawsDto.getXCXSSRQGJ()) + .nowCarTime(lawsDto.getZCCSSRQGJ()) + .ZRBM(lawsDto.getZRBM()) + .SYCPX(lawsDto.getSYCPX()) + .CYCVPPSBM(lawsDto.getCYCVPPSBM()) + .CYCVPPSCN(lawsDto.getCYCVPPSCN()) + .KCCVPPSBM(lawsDto.getKCCVPPSBM()) + .KCCVPPSCN(lawsDto.getKCCVPPSCN()) + .build(); + } EasyExcel.write(response.getOutputStream(), LawsDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(data); } catch (Exception e) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 8ff2ad4e..f5cd3c3f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -34,9 +34,9 @@ public class LawsDto { @ApiModelProperty(value = "标准实施日期") private String putTime; @ApiModelProperty(value = "新车型实施日期") - private String newCarTime; + private String XCXSSRQGJ; @ApiModelProperty(value = "在产车实施日期") - private String nowCarTime; + private String ZCCSSRQGJ; @ApiModelProperty(value = "责任部门") private String ZRBM; @ApiModelProperty(value = "适用产品线") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 6c0992e4..fb9f6787 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -2,8 +2,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * //TODO 添加类、接口描述 @@ -14,6 +16,8 @@ import lombok.Data; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class StandExcelDto { @ApiModelProperty(value = "标准编号") private String standNumber; @@ -22,7 +26,7 @@ public class StandExcelDto { @ApiModelProperty(value = "英文名称") private String standEnName; @ApiModelProperty(value = "适用车型") - private String[] typeApplicable; + private String typeApplicable; @ApiModelProperty(value = "能源类型") private String NYLX; @ApiModelProperty(value = "标准实施日期")