|
@@ -107,9 +107,13 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<PtlAgreementUndwrtRulesNew> rulesList(String agreementId) {
|
|
public List<PtlAgreementUndwrtRulesNew> rulesList(String agreementId) {
|
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
List<PtlAgreementUndwrtRulesNew> rulesList = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreementUndwrtRulesNew>()
|
|
List<PtlAgreementUndwrtRulesNew> rulesList = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreementUndwrtRulesNew>()
|
|
|
.eq(PtlAgreementUndwrtRulesNew::getAgreementId, agreementId)
|
|
.eq(PtlAgreementUndwrtRulesNew::getAgreementId, agreementId)
|
|
|
- .eq(PtlAgreementUndwrtRulesNew::getValidInd, "1"));
|
|
|
|
|
|
|
+ .eq(PtlAgreementUndwrtRulesNew::getValidInd, "1")
|
|
|
|
|
+ .le(PtlAgreementUndwrtRulesNew::getRulesStartDate, now)
|
|
|
|
|
+ .ge(PtlAgreementUndwrtRulesNew::getRulesEndDate, now));
|
|
|
|
|
+
|
|
|
List<PtlAgreementUndwrtRulesAttrLink> ptlAgreementUndwrtRulesAttrLinkList = ptlAgreementUndwrtRulesAttrLinkService.list();
|
|
List<PtlAgreementUndwrtRulesAttrLink> ptlAgreementUndwrtRulesAttrLinkList = ptlAgreementUndwrtRulesAttrLinkService.list();
|
|
|
rulesList.forEach(item -> {
|
|
rulesList.forEach(item -> {
|
|
|
List<PtlAgreementUndwrtRulesAttrLink> collect = ptlAgreementUndwrtRulesAttrLinkList.stream().filter(x -> Objects.equals(x.getRulesId(), item.getId())).collect(Collectors.toList());
|
|
List<PtlAgreementUndwrtRulesAttrLink> collect = ptlAgreementUndwrtRulesAttrLinkList.stream().filter(x -> Objects.equals(x.getRulesId(), item.getId())).collect(Collectors.toList());
|