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'),