diff --git a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java index 602e045..058ae27 100644 --- a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java +++ b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java @@ -317,8 +317,14 @@ public class InsureContorll { /*新增项目*/ insured.put("benefit_basic_plan", insurePlansList.stream().filter(v -> v.getType().equals("BENEFIT_BASIC_PLAN")).collect(Collectors.toList()).get(0).getPlanId()); insured.put("benefit_occupation_category", p.getBenefitOccupationCategory()); - insured.put("benefit_3rd_party_lib", insurePlansList.stream().filter(v -> v.getType().equals("BENEFIT_3RD_PARTY_LIB")).collect(Collectors.toList()).get(0).getPlanId()); - insured.put("benefit_24hours", insurePlansList.stream().filter(v -> v.getType().equals("BENEFIT_24HOURS")).collect(Collectors.toList()).get(0).getPlanId()); + /*如果是旧产品这两项目为空*/ + if (insureProduct.getId() == 3||insureProduct.getId()==4) { + insured.put("benefit_3rd_party_lib", ""); + insured.put("benefit_24hours", ""); + } else { + insured.put("benefit_3rd_party_lib", insurePlansList.stream().filter(v -> v.getType().equals("BENEFIT_3RD_PARTY_LIB")).collect(Collectors.toList()).get(0).getPlanId()); + insured.put("benefit_24hours", insurePlansList.stream().filter(v -> v.getType().equals("BENEFIT_24HOURS")).collect(Collectors.toList()).get(0).getPlanId()); + } insuredArray.add(insured); }); quotations.put("insured", insuredArray); diff --git a/src/main/java/cn/timer/api/dto/insure/InsureUserDto.java b/src/main/java/cn/timer/api/dto/insure/InsureUserDto.java index 3d9d202..343721b 100644 --- a/src/main/java/cn/timer/api/dto/insure/InsureUserDto.java +++ b/src/main/java/cn/timer/api/dto/insure/InsureUserDto.java @@ -20,4 +20,5 @@ public class InsureUserDto { private String policyNo; private String name; private Date updateTime; + private Integer productPlanId; } diff --git a/src/main/resources/mapping/insure/InsurePolicyMapper.xml b/src/main/resources/mapping/insure/InsurePolicyMapper.xml index 2ee3f2b..8e2cd6e 100644 --- a/src/main/resources/mapping/insure/InsurePolicyMapper.xml +++ b/src/main/resources/mapping/insure/InsurePolicyMapper.xml @@ -318,7 +318,7 @@ ip.policy_no as policyNo, ip.org_code as orgCode, iu.insured_name as insuredName, - iu.benefit_basic_plan as benefitBasicPlan, + iu.product_plan_id as benefitBasicPlan, iu.benefit_occupation_category as benefitOccupationCategory, iu.product_plan_id as productPlanId, ip.policy_pay_type as policyPayType,