diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java index 8bbbe1ef5e..79be9a25ff 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java @@ -26,9 +26,10 @@ public class IcPolicyRuleDetailDTO { private String ruleDesc; /** - * 与上一条的关系;and、or + * 与下一条的关系;and、or + * 如果没有条件的话,此列为空 */ - private String lastLogicalRel; + private String nextLogicalRel; /** * 分组id;人员信息有值; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java index ee959255b0..7516f2aca6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java @@ -44,9 +44,10 @@ public class IcPolicyRuleDetailEntity extends BaseEpmetEntity { private String groupType; /** - * 与上一条的关系;and、or + * 与下一条的关系;and、or + * 如果没有条件的话,此列为空 */ - private String lastLogicalRel; + private String nextLogicalRel; /** * 分组id;人员信息有值; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index f46a0b0af8..09d7977b6a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -336,7 +336,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resiRules = originResiRules .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getLastLogicalRel(), r.getItemGroupId(), + .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getNextLogicalRel(), r.getItemGroupId(), r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal())) .collect(Collectors.toList()); @@ -349,7 +349,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl houseRules = originHouseRules .stream() .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(), - r.getRuleDesc(), r.getLastLogicalRel(), r.getQueryType())) + r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType())) .collect(Collectors.toList()); aggForm.getRuleList().setHouseRule(houseRules); } @@ -359,7 +359,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl statRules = originStatRules .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getLastLogicalRel(), + .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getNextLogicalRel(), r.getRuleDesc(), r.getQueryType(), r.getColTable())) .collect(Collectors.toList());