diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index 406129b..78bf797 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -59,7 +59,7 @@ public class TaskTimeController { ValidatorBean.beginValid(taskTimeExpression); taskTime.setRedTimeName(taskTimeExpression.getName()); - taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression()); + taskTime.setRedTimeExpression(taskTimeExpression.getExpressionContent()); taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); ConvertBean.modelInitialize(taskTime, AuthUtil.getSessionUser()); @@ -95,7 +95,7 @@ public class TaskTimeController { // 数据冗余 taskTime.setRedTimeName(taskTimeExpression.getName()); - taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression()); + taskTime.setRedTimeExpression(taskTimeExpression.getExpressionContent()); ConvertBean.modelUpdate(taskTime, AuthUtil.getSessionUser()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java index 7419418..935f3b9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java @@ -46,16 +46,12 @@ public class TaskTimeExpressionController { // 数据校验 ValidatorBean.beginValid(timeExpression) .notNull("name", timeExpression.getName()) - .notNull("timeExpression", timeExpression.getTimeExpression()) - .notNull("timeDescription", timeExpression.getTimeDescription()); + .notNull("expressionContent", timeExpression.getExpressionContent()) + .notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime()); - ConvertBean.modelInitialize(timeExpression, AuthUtil.getSessionUser()); + taskTimeExpressionService.insertTaskTimeExpression(timeExpression); - timeExpression = taskTimeExpressionService.insertTaskTimeExpression(timeExpression); - - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(timeExpression); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + ":{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -73,16 +69,11 @@ public class TaskTimeExpressionController { ValidatorBean.beginValid(timeExpression) .notNull("id", timeExpression.getId()) .notNull("name", timeExpression.getName()) - .notNull("timeExpression", timeExpression.getTimeExpression()) - .notNull("timeDescription", timeExpression.getTimeDescription()); - - ConvertBean.modelInitialize(timeExpression, AuthUtil.getSessionUser()); + .notNull("timeExpression", timeExpression.getExpressionContent()); taskTimeExpressionService.updateTaskTimeExpression(timeExpression); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(timeExpression); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + ":{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java index 1da712a..396275e 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java @@ -54,8 +54,8 @@ public class TestTaskTimeExpressionService extends TestBase { public void testInsertTaskTimeExpression() { TaskTimeExpression taskTimeExpression = new TaskTimeExpression(); taskTimeExpression.setName("表达式"); - taskTimeExpression.setTimeExpression("0000000"); - taskTimeExpression.setTimeDescription("描述"); + taskTimeExpression.setExpressionContent("0000000"); + taskTimeExpression.setExpressionDescription("描述"); for (int i = 0; i < 50; i++) { taskTimeExpression.setId(null);