From c2c1fdf7cafdbdb4a0431c7fce555f44199a245d Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 1 Nov 2022 16:26:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=AF=A6=E6=83=85-=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=9F=A5=E7=9C=8B=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableTaskController.java           |  7 ++++++-
 frontend/src/views/dataset/data/UpdateInfo.vue        | 11 +++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
index 90b7bf6c6e..a4a36265ee 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
@@ -67,7 +67,12 @@ public class DataSetTableTaskController {
     @PostMapping("list/{goPage}/{pageSize}")
     public Pager<List<DataSetTaskDTO>> list(@RequestBody DatasetTableTask datasetTableTask, @PathVariable int goPage, @PathVariable int pageSize) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        return PageUtils.setPageInfo(page, dataSetTableTaskService.list(datasetTableTask));
+        Pager<List<DataSetTaskDTO>> listPager = PageUtils.setPageInfo(page, dataSetTableTaskService.list(datasetTableTask));
+        List<DataSetTaskDTO> listObject = listPager.getListObject();
+        for (DataSetTaskDTO dto : listObject) {
+            dataSetTableTaskLogService.lastExecStatus(dto);
+        }
+        return listPager;
     }
 
     @ApiOperation("分页查询")
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index c9d90257ce..b51c4da2f2 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -66,8 +66,15 @@
               v-if="scope.row.lastExecStatus"
               :class="[`de-${scope.row.lastExecStatus}-pre`, 'de-status']"
             >{{
-              $t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`)
-            }}
+               $t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`)
+             }}
+              <svg-icon
+                v-if="scope.row.lastExecStatus === 'Error'"
+                style="cursor: pointer;"
+                icon-class="icon-maybe"
+                class="field-icon-location"
+                @click="showErrorMassage(scope.row.msg)"
+              />
             </span>
             <span v-else>-</span>
           </template>