承保规则历史 bug修改

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesNewHistoryServiceImpl.java

@@ -61,8 +61,8 @@ public class PtlAgreementUndwrtRulesNewHistoryServiceImpl extends ServiceImpl<Pt
                 .eq("agreement_id", agreementUndwrtRulesQueryVo.getAgreementId())
                 .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperator()), "modifier", agreementUndwrtRulesQueryVo.getOperator())
                 .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorType()), "operator_type", agreementUndwrtRulesQueryVo.getOperatorType())
-                .le(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorStartTime())
-                .ge(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorEndTime());
+                .ge(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorStartTime())
+                .le(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorEndTime());
         Page selectPage = baseMapper.selectPage(page, wrapper);
         List<PtlAgreementUndwrtRulesNewHistory> records = selectPage.getRecords();
 
@@ -119,6 +119,20 @@ public class PtlAgreementUndwrtRulesNewHistoryServiceImpl extends ServiceImpl<Pt
 
         // 查询费用属性模型
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
+        agreementUndwrtRulesAttrLinkHistorie.forEach(item->{
+            undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(item.getAttrCode())).forEach(x->{
+                if(x.getAttrType().equals("checkbox") || x.getAttrType().equals("select")) {
+                    if(item.getMin() != null) {
+                        x.setMinArray(item.getMin().split(","));
+                    }
+                }else {
+                    x.setMin(item.getMin());
+                    x.setMax(item.getMax());
+                    x.setOperator(item.getOperator());
+                }
+            });
+        });
+
 
         // 设置费用属性因子列表
         agreementUndwrtRulesNewHistory.setCostsAttrLinkList(undwrtRulesAttrList);