diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java index 609c7a0..dcb9d74 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java @@ -45,7 +45,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; @NoArgsConstructor public class CheckOrder extends SimpleEntity { @Column(nullable = false) - private String key; + private String keyword; @Column(nullable = false) private String description; @Column(nullable = false) @@ -73,14 +73,14 @@ public class CheckOrder extends SimpleEntity { private Boolean over = false; public CheckOrder( - String key, + String keyword, String description, Type type, String parameters, String targetClass, User targetUser ) { - this.key = key; + this.keyword = keyword; this.description = description; this.type = type; this.parameters = parameters; @@ -90,14 +90,14 @@ public class CheckOrder extends SimpleEntity { } public CheckOrder( - String key, + String keyword, String description, Type type, String parameters, String targetClass, User.Role targetRole ) { - this.key = key; + this.keyword = keyword; this.description = description; this.type = type; this.parameters = parameters; diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java index 1ba27e1..d4ce51d 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java @@ -69,7 +69,7 @@ public class ConfirmationService extends SimpleServiceSupport impl @Override public void onChecked(CheckOrder order, CheckOrder.Operation operation, ImmutableMap parameters) { - if (StrUtil.equals(order.getKey(), "confirmation_check")) { + if (StrUtil.equals(order.getKeyword(), "confirmation_check")) { Long id = (Long) parameters.get("confirmationId"); switch (operation) { case APPLY: