From 0779f2c8e9cd1573c3def89e7f01a3bc7ecc5faf Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 29 Jul 2021 15:07:07 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E9=A1=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsDetailedList/entity/ExcelDto.java | 21 ++++++++++ .../entity/SarStandUnqualified.java | 7 +--- .../impl/SarStandUnqualifiedServiceImpl.java | 40 +++++++++++++++---- 3 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java new file mode 100644 index 00000000..1a37c435 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-29 + */ +@Data +public class ExcelDto extends SarStandUnqualified { + + @ExcelProperty("创建时间") + private String createTime1; + @ExcelProperty("计划关闭时间") + private String planCloseTime1; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 347f77df..7158dc30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -81,7 +81,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("CREATE_BY_ID") private String createById; - @ExcelProperty(value = "创建时间",converter = TimestampConverter.class) + @ExcelIgnore @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -100,7 +100,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ACTUAL_CLOSE_TIME") private Date actualCloseTime; - @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -126,8 +126,6 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - - @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") @TableField("PRODUCT_TYPE") @@ -138,7 +136,6 @@ public class SarStandUnqualified extends BaseEntity { @TableId(type = IdType.UUID) private String id; - @ApiModelProperty(value = "质量工程师") @TableField(exist=false) private String qaEngineerName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 1270bef4..71be68e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandUnqualified.service.impl; -import com.adc.da.att.entity.AttFileEO; +import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; +import com.adc.da.slrs.sarLawsDetailedList.entity.ExcelDto; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage; @@ -11,13 +12,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.stereotype.Service; import java.sql.Timestamp; -import java.time.LocalDateTime; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -128,9 +128,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl0){ sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); } - List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); - List a = stand; - return a; + List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + List list = new ArrayList<>(); + list = BeanConverUtil.converList(stand,ExcelDto.class); + for (int a=0;a