From 1f7ec5c8c71b4e4c9b363905ae610063b32501fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 6 Aug 2020 18:52:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/SysTaskPlanController.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index d5212e3..7bc24d7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -558,6 +558,10 @@ public class SysTaskPlanController extends CoreBaseController { .addTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName() , sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam()); } + + // 重置状态 + sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + sysTaskPlanService.updateSysTaskPlan(sysTaskPlan); } // 刷新全部缓存 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java index 5264265..b1dac77 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java @@ -166,8 +166,8 @@ public class NoSqlPack { ElasticSearchPack result = packElasticSearchPack(bean); result.andKeywordEquals("id",bean.getId()); - result.andTextLike("name",bean.getName()); - result.andStringEquals("groupName",bean.getGroupName()); + result.andStringLike("name",bean.getName()); + result.andStringLike("groupName",bean.getGroupName()); result.andStringEquals("schedulerServerIp",bean.getSchedulerServerIp()); result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());