From bac2851b48ded7ad4c16884b0b014eaee7f7323d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 22 Feb 2022 16:37:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ImportTaskCommonResultDTO.java | 35 +++++++++++++++++--
 .../service/impl/ImportTaskServiceImpl.java   | 14 ++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java
index 9fd7c0760c..9812f1abbc 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java
@@ -1,14 +1,43 @@
 package com.epmet.dto.result;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-public class ImportTaskCommonResultDTO {
+public class ImportTaskCommonResultDTO implements Serializable {
+    public ImportTaskCommonResultDTO(String taskId) {
+        this.taskId = taskId;
+    }
 
     private String taskId;
 
+    /**
+     * 原始文件名
+     */
+    private String originFileName;
+
+    /**
+     * 业务类型。resi:居民；楼栋:building；房屋:house。依次补充
+     */
+    private String bizType;
+
+    /**
+     * 处理状态。processing:处理中；finished:完成；导入失败：finished_fail
+     */
+    private String processStatus;
+
+    /**
+     * 开始导入的时间
+     */
+    private Date startTime;
+
+    /**
+     * 失败文件地址
+     */
+    private String resultDescFile;
+
 }
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java
index 7d6cb24573..d88bb945b6 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.ImportTaskDao;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
@@ -16,7 +17,9 @@ import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -93,10 +96,15 @@ public class ImportTaskServiceImpl implements ImportTaskService {
     public PageData<ImportTaskCommonResultDTO> page(ImportTaskCommonFormDTO param) {
         LambdaQueryWrapper<ImportTaskEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportTaskEntity::getOperatorId,param.getOperatorId());
-        Page<ImportTaskCommonResultDTO> page = PageHelper.startPage(param.getPageNo(), param.getPageSize(), param.isPage()).doSelectPage(() -> {
+        Page<ImportTaskEntity> page = PageHelper.startPage(param.getPageNo(), param.getPageSize(), param.isPage()).doSelectPage(() -> {
             importRecordDao.selectList(queryWrapper);
         });
-        PageData<ImportTaskCommonResultDTO> result = new PageData<>(page.getResult(),page.getTotal());
-        return result;
+        List<ImportTaskCommonResultDTO> list = new ArrayList<>();
+        page.getResult().forEach(item->{
+            ImportTaskCommonResultDTO record = ConvertUtils.sourceToTarget(item, ImportTaskCommonResultDTO.class);
+            record.setTaskId(item.getId());
+            list.add(record);
+        });
+        return new PageData<>(list,page.getTotal());
     }
 }