update：未符合整改项导出

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

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;

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 ServiceImpl<SarStandUnqualif
         if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
             sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
         }
-               List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+        List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
-        List<SarStandUnqualified> a = stand;
+        List<ExcelDto> list = new ArrayList<>();
-        return a;
+        list = BeanConverUtil.converList(stand,ExcelDto.class);
+        for (int a=0;a<stand.size();a++){
+            Date date = null;
+            String str;
+            try {
+                if (stand.get(a).getCreateTime() != null) {
+                    String dateStr = stand.get(a).getCreateTime().toString();
+                    SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
+                    date = sdf.parse(dateStr);
+                    SimpleDateFormat sdf1=new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                    String sDate=sdf1.format(date);
+                    list.get(a).setCreateTime1(sDate);
+                }
+                if (stand.get(a).getActualCloseTime() != null) {
+                    String dateStr = stand.get(a).getActualCloseTime().toString();
+                    SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
+                    date = sdf.parse(dateStr);
+                    SimpleDateFormat sdf1=new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                    String sDate=sdf1.format(date);
+                    date=sdf1.parse(sDate);
+                    list.get(a).setActualCloseTime(date);
+                }
+                } catch(ParseException e){
+                    e.printStackTrace();
+                }
+        }
+        return stand;
     }
 
     private boolean closeSarStandUnqualified(String standUnqualifiedId){