协议费用BUG 修改

commons/src/main/java/com/jzg/commons/entity/vo/PtlAgreementCostRuleVo.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
+import com.jzg.commons.entity.po.SysDict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -44,4 +46,8 @@ public class PtlAgreementCostRuleVo{
 
     private PtlAgreementUndwrtRulesAttr rulesAttr;
 
+
+    @TableField(exist = false)
+    private List<SysDict> rulesDict;
+
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -14,10 +14,9 @@ import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.CostListVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRuleVo;
-import com.jzg.commons.entity.vo.PtlAgreementCostTypeVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostVo;
-import com.jzg.commons.util.BuildDescUtils;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.BuildDescUtils;
 import com.jzg.commons.util.ListUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.mapper.PtlAgreementCostMapper;
@@ -26,11 +25,11 @@ import com.jzg.organization.service.PtlAgreementCostService;
 import com.jzg.organization.service.PtlAgreementCostTypeService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
 import com.jzg.organization.state.CostState;
-import com.jzg.organization.state.UserState;
 import com.jzg.organization.state.listener.CostStateListener;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
+import org.redisson.api.RList;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.statemachine.StateMachine;
@@ -44,6 +43,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.jzg.commons.constants.RedisKeyConstants.DICT_REDIS_KEY;
+
 
 @Slf4j
 @Service
@@ -61,8 +62,8 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
     @Resource
     private PtlAgreementUndwrtRulesAttrService agreementUndwrtRulesAttrService;
 
-
-
+    @Autowired
+    RedissonClient redissonClient;
 
     @Autowired
     @Qualifier("costStateMachine")
@@ -173,10 +174,12 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         if (ObjectUtil.isEmpty(ptlAgreementCostVo)){
             return HttpResult.ok(ptlAgreementCostVo);
         }
+        RList<SysDict> rules = redissonClient.getList(DICT_REDIS_KEY + "rule_operator");
         for (PtlAgreementCostRuleVo ruleCondition : ptlAgreementCostVo.getRuleConditions()) {
             if (StringUtils.isNotEmpty(ruleCondition.getMin()) && ruleCondition.getMin().contains(",")){
                 ruleCondition.setMinArray(Arrays.asList(ruleCondition.getMin().split(",")));
             }
+            ruleCondition.setRulesDict(rules);
         }
         return HttpResult.ok(ptlAgreementCostVo);
     }