From e59864c5eeef88881246d16a3601c620f9e22252 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sun, 1 Aug 2021 15:48:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E4=BC=98=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/base/mapper/ext/query/GridExample.java  |  2 +-
 frontend/src/views/dataset/data/UpdateInfo.vue       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java b/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java
index 6982b53e42..299bb3be3a 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java
@@ -175,7 +175,7 @@ public class GridExample {
                     addCriterion(field);
                     break;
                 case "sql in":
-                    addCriterion(field);
+                    addCriterion(field+" in ", value, field);
                     break;
             }
             return (Criteria) this;
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index a5dd6269ce..1c25adaa34 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -576,6 +576,18 @@ export default {
 
       })
     },
+    changeTaskStatus(task) {
+      const param = task
+      param.status = task.status === 'Underway' ? 'Pending' : 'Underway'
+      post('/dataset/task/updateStatus', task).then(response => {
+        task.status = param.status
+        this.$message({
+          message: this.$t('dataset.task.change_success'),
+          type: 'success',
+          showClose: true
+        })
+      })
+    },
     deleteTask(task) {
       this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), {
         confirmButtonText: this.$t('dataset.confirm'),