From c783f40d415da7354572b0045a6e0c3c1d9f8f1c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 10 Dec 2021 15:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6excel=E5=AF=BC=E5=87=BA=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8E=E8=A1=A8=E6=A0=BC=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 5 ++- .../dao/EarlyWarningEODao.java | 3 +- .../entity/EarlyWarningEO.java | 14 +++---- .../entity/WarningExportVO.java | 35 +++++++++++++++++ .../service/EarlyWarningEOService.java | 3 +- .../Impl/EarlyWarningEOServiceImpl.java | 5 ++- .../sarStandWarning/EarlyWraningEOMapper.xml | 38 ++++++++++++++----- 7 files changed, 80 insertions(+), 23 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java 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 5a97d919..987beea9 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 @@ -9,6 +9,7 @@ import com.adc.da.slrs.sarStandIssueControlProduct.entity.StandIssueControlProdu import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.alibaba.excel.EasyExcel; @@ -148,11 +149,11 @@ public class EarlyWarningEOController extends BaseController { response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + List exportExcel = earlyWarningEOService.getExportExcel(excelVO); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(exportExcel); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 6bef46dd..618770a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -14,6 +15,6 @@ public interface EarlyWarningEODao extends BaseMapper { IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); - List exportWarning(@Param("idList") List ids); + List exportWarning(@Param("idList") List ids); } 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 9ad1b399..21172be4 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 @@ -47,17 +47,17 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standType; - @ExcelProperty("标准号") + @ExcelProperty(value = "标准号",index = 1) @ApiModelProperty("标准号") @TableField(exist = false) private String standCode; - @ExcelProperty("标准名称") + @ExcelProperty(value = "标准名称",index = 2) @ApiModelProperty("标准名称") @TableField(exist = false) private String standName; - @ExcelProperty("发布日期") + @ExcelProperty(value = "发布日期",index = 5) @ApiModelProperty("发布日期") @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") @@ -67,12 +67,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private Date lastTime; - @ExcelProperty("适用车型") + @ExcelIgnore @ApiModelProperty("适用车型") @TableField(exist = false) private String applyType; - @ExcelProperty("责任工程师") + @ExcelIgnore @ApiModelProperty("责任工程师") @TableField(exist = false) private String dutyEngineer; @@ -82,12 +82,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsId; - @ExcelProperty("条款（分解单）编号") + @ExcelProperty(value = "条款（分解单）编号",index = 3) @ApiModelProperty("条款（分解单）编号") @TableField(exist = false) private String itemsNum; - @ExcelProperty("条款（分解单）名称") + @ExcelProperty(value = "条款（分解单）名称",index = 4) @ApiModelProperty("条款（分解单）名称") @TableField(exist = false) private String itemsName; 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 new file mode 100644 index 00000000..74b67615 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WarningExportVO extends EarlyWarningEO { + + + + @ExcelProperty(value = "实施日期",index = 6) + @ApiModelProperty("标准号") + private String SSRQ; + + + @ExcelProperty(value = "新车型实施日期",index = 7) + @ApiModelProperty("新车型实施日期") + private String XCXSSRQ; + + @ExcelProperty(value = "在产车实施日期",index = 8) + @ApiModelProperty("在产车实施日期") + private String ZCCSSRQ; + + @ExcelProperty(value = "标准类别",index = 0) + @ApiModelProperty("标准类别显示") + private String standTypeShow; + + @ExcelProperty(value = "适用车型",index = 9) + @ApiModelProperty("适用车型展示") + private String applyTypeShow; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index fea9090f..b5079d69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -22,5 +23,5 @@ public interface EarlyWarningEOService extends IService { IPage getStandWarning(StandWarningEO queryPage); - List getExportExcel(WarningExcelVO excelVO); + List getExportExcel(WarningExcelVO excelVO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 57569568..0b8f6f78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -120,8 +121,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getExportExcel(WarningExcelVO excelVO){ - List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); + public List getExportExcel(WarningExcelVO excelVO){ + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); // IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); return standWarningEOList; 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 fdc9655e..1e2ee222 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 @@ -38,8 +38,6 @@ - - AND trim(replace(CONCAT( sarInfo.STAND_SORT, @@ -74,18 +72,35 @@ ) - SELECT WARNING_RESULT.* FROM ( SELECT - - , - attr.CLLX AS - APPLY_TYPE , - attr - .ZRGCS AS DUTY_ENGINEER , + , + dicType.DIC_TYPE_NAME AS applyTypeShow, + attr.CLLX AS APPLY_TYPE , + attr.ZRGCS AS DUTY_ENGINEER , NULL AS ITEMS_ID , NULL AS ITEMS_NUM , NULL AS ITEMS_NAME , NULL AS POLICY_ID , @@ -97,6 +112,7 @@ 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 + LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =attr.CLLX POWER = '1' AND (MARK = 'stand') @@ -116,7 +132,8 @@ UNION ALL SELECT - , + , + dicType.DIC_TYPE_NAME AS applyTypeShow, items.APPLY_ARCTIC AS APPLY_TYPE , items.DUTY_ENGINEER AS DUTY_ENGINEER , items.ID AS ITEMS_ID , @@ -133,6 +150,7 @@ LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID + LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =items.APPLY_ARCTIC POWER = '1' AND (MARK = 'item')