From 79a5c62b625b6e72167d0e9e3df8b5b4b3bdb768 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 20 Apr 2023 14:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8C=89=E7=85=A7id=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ImportTaskCommonResultDTO.java |  3 +++
 .../com/epmet/controller/ImportTaskController.java  | 13 +++++++++++++
 .../java/com/epmet/entity/ImportTaskEntity.java     |  3 +++
 .../java/com/epmet/service/ImportTaskService.java   |  2 ++
 .../epmet/service/impl/ImportTaskServiceImpl.java   |  8 ++++++++
 .../src/main/resources/mapper/ImportTaskDao.xml     |  2 ++
 6 files changed, 31 insertions(+)

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 9812f1abbc..22264424a2 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
@@ -40,4 +40,7 @@ public class ImportTaskCommonResultDTO implements Serializable {
      */
     private String resultDescFile;
 
+    private Integer successItemsQty;
+    private Integer failItemsQty;
+
 }
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
index d1d43b148b..5519578120 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
@@ -21,6 +21,19 @@ public class ImportTaskController {
     @Autowired
     private ImportTaskService importTaskService;
 
+    /**
+     * @description: 通过id查找
+     * @param taskId:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/20 2:17 PM
+     */
+    @RequestMapping("/getById")
+    public Result<ImportTaskCommonResultDTO> getById(@RequestParam("taskId") String taskId) {
+        ImportTaskCommonResultDTO r = importTaskService.getById(taskId);
+        return new Result<ImportTaskCommonResultDTO>().ok(r);
+    }
+
     /**
      * desc:分页获取个人导入记录
      * @param tokenDto
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java
index 0602a42963..756d5a7937 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java
@@ -54,4 +54,7 @@ public class ImportTaskEntity extends BaseEpmetEntity {
 
 	private String resultDesc;
 
+	private Integer successItemsQty;
+	private Integer failItemsQty;
+
 }
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java
index bb1acf5c36..74ceb6a3f4 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java
@@ -52,4 +52,6 @@ public interface ImportTaskService {
      * @return
      */
     Boolean processingTaskCheck(String bizType);
+
+    ImportTaskCommonResultDTO getById(String taskId);
 }
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 f81e4cc949..6d37dab168 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
@@ -121,4 +121,12 @@ public class ImportTaskServiceImpl implements ImportTaskService {
 
         return importRecordDao.selectCount(query) > 0;
     }
+
+    @Override
+    public ImportTaskCommonResultDTO getById(String taskId) {
+        ImportTaskEntity task = importRecordDao.selectById(taskId);
+        ImportTaskCommonResultDTO r = ConvertUtils.sourceToTarget(task, ImportTaskCommonResultDTO.class);
+        r.setTaskId(taskId);
+        return r;
+    }
 }
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml
index df58afb615..8c17d0d858 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml
@@ -12,6 +12,8 @@
         <result property="startTime" column="START_TIME"/>
         <result property="resultDescFile" column="RESULT_DESC_FILE"/>
         <result property="resultDesc" column="RESULT_DESC"/>
+        <result property="successItemsQty" column="SUCCESS_ITEMS_QTY"/>
+        <result property="failItemsQty" column="FAIL_ITEMS_QTY"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>