Commit f6aaacbd by 翁国栋

8小时保单

parent 89071d7d
...@@ -2022,7 +2022,8 @@ public class InsureContorll { ...@@ -2022,7 +2022,8 @@ public class InsureContorll {
.price(price)/*前端获取的保费*/ .price(price)/*前端获取的保费*/
.premium(price) .premium(price)
.batchNo(batchData.get("import_uuid").toString()) .batchNo(batchData.get("import_uuid").toString())
.benefitBasicPlan(y.getBenefitBasicPlan()) // .benefitBasicPlan(y.getBenefitBasicPlan())
.productPlanId(y.getProductPlanId())
.policyNo(orderImportInfo.get("contract_no").toString()) .policyNo(orderImportInfo.get("contract_no").toString())
.userId(y.getUserId()) .userId(y.getUserId())
.orgCode(y.getOrgCode()) .orgCode(y.getOrgCode())
......
...@@ -73,6 +73,7 @@ public class InsureUserController{ ...@@ -73,6 +73,7 @@ public class InsureUserController{
InsureProductPlan insureProductPlan = InsureProductPlan.builder().id(user.getProductPlanId()).build().selectById(); InsureProductPlan insureProductPlan = InsureProductPlan.builder().id(user.getProductPlanId()).build().selectById();
user.setPlanIds(JSON.parseArray(insureProductPlan.getPlanJson(), String.class)); user.setPlanIds(JSON.parseArray(insureProductPlan.getPlanJson(), String.class));
user.setProductName(insureProductPlan.getName()); user.setProductName(insureProductPlan.getName());
user.setBenefitBasicPlan(String.valueOf(insureProductPlan.getId()));
return ResultUtil.data(user); return ResultUtil.data(user);
} }
......
...@@ -21,4 +21,5 @@ public class InsureUserDto { ...@@ -21,4 +21,5 @@ public class InsureUserDto {
private String name; private String name;
private Date updateTime; private Date updateTime;
private Integer productPlanId; private Integer productPlanId;
private Integer productId;
} }
...@@ -49,4 +49,5 @@ public class PolicyDto { ...@@ -49,4 +49,5 @@ public class PolicyDto {
private String companyName; private String companyName;
private boolean isAll = false; private boolean isAll = false;
private Integer productPlanId; private Integer productPlanId;
private String planName;
} }
...@@ -356,6 +356,7 @@ ...@@ -356,6 +356,7 @@
<select id="selectPolicyListByorgCode" resultType="cn.timer.api.dto.insure.InsureUserDto"> <select id="selectPolicyListByorgCode" resultType="cn.timer.api.dto.insure.InsureUserDto">
SELECT SELECT
ip.product_id as productId,
ip.id as id, ip.id as id,
ip.policy_no as policyNo, ip.policy_no as policyNo,
ir.name, ir.name,
......
...@@ -286,11 +286,13 @@ ...@@ -286,11 +286,13 @@
iu.policy_date_end,iu.create_time,iu.insured_name,iu.benefit_basic_plan AS benefitBasicPlan,iu.price AS price, iu.policy_date_end,iu.create_time,iu.insured_name,iu.benefit_basic_plan AS benefitBasicPlan,iu.price AS price,
iu.user_id as userId,iu.batch_no as batchNo,iu.benefit_occupation_category as benefitOccupationCategory, iu.user_id as userId,iu.batch_no as batchNo,iu.benefit_occupation_category as benefitOccupationCategory,
iu.policy_id as policyId, iu.policy_id as policyId,
iu.apply_type as applyType iu.apply_type as applyType,
ipp.name as planName
from insure_user iu from insure_user iu
LEFT JOIN yggl_main_emp yme on yme.id=iu.user_id LEFT JOIN yggl_main_emp yme on yme.id=iu.user_id
LEFT JOIN insure_policy ip on ip.id=iu.policy_id LEFT JOIN insure_policy ip on ip.id=iu.policy_id
LEFT JOIN insure_product io on io.id=ip.product_id LEFT JOIN insure_product io on io.id=ip.product_id
LEFT JOIN insure_product_plan ipp on ipp.id =iu.product_plan_id
<where> <where>
<if test="policyDto.orgCode !=null and policyDto.orgCode !=''"> <if test="policyDto.orgCode !=null and policyDto.orgCode !=''">
and ip.org_code=#{policyDto.orgCode} and ip.org_code=#{policyDto.orgCode}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment