Skip to content

Y
yd-backend
Commit 3edb7631 by hongzhong
Options

202201：薪资单::直接辅导岗位津贴,间接辅导岗位津贴显示保单信息

parent a63aad31
Showing with 71 additions and 4 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -1151,7 +1151,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1151,7 +1151,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
commission.setInsurance_Cust(withdrawLabelInfo.getInsuredName());//投保人 commission.setInsurance_Cust(withdrawLabelInfo.getInsuredName());//投保人
commission.setPol_name_chn(withdrawLabelInfo.getProductName());//产品名称 commission.setPol_name_chn(withdrawLabelInfo.getProductName());//产品名称
commission.setPolicyno(withdrawLabelInfo.getPolicyNo());//保单号 commission.setPolicyno(withdrawLabelInfo.getPolicyNo());//保单号
commission.setRate(withdrawLabelInfo.getFycRate().intValue());//职佣率 commission.setRate(withdrawLabelInfo.getCalculationRate().intValue());//职佣率
commission.setSalesCommissionRate(withdrawLabelInfo.getCommissionRate().doubleValue()); commission.setSalesCommissionRate(withdrawLabelInfo.getCommissionRate().doubleValue());
commission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());//体系 commission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());//体系
commission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费 commission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费
...@@ -1187,12 +1187,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1187,12 +1187,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
RenewalYearPerformanceCommission renewalYearPerformanceCommission = new RenewalYearPerformanceCommission(); RenewalYearPerformanceCommission renewalYearPerformanceCommission = new RenewalYearPerformanceCommission();
renewalYearPerformanceCommission.setComments(withdrawLabelInfo.getRemark()); renewalYearPerformanceCommission.setComments(withdrawLabelInfo.getRemark());
renewalYearPerformanceCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount())); renewalYearPerformanceCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount()));
renewalYearPerformanceCommission.setRate(String.valueOf(withdrawLabelInfo.getFycRate())); renewalYearPerformanceCommission.setRate(String.valueOf(withdrawLabelInfo.getCalculationRate()));
renewalYearPerformanceCommission.setFYC_RYC(String.valueOf(withdrawLabelInfo.getFycAmount())); renewalYearPerformanceCommission.setFYC_RYC(String.valueOf(withdrawLabelInfo.getFycAmount()));
renewalYearPerformanceCommission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName()); renewalYearPerformanceCommission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());
renewalYearPerformanceCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式 renewalYearPerformanceCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
renewalYearPerformanceCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode())); renewalYearPerformanceCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
renewalYearPerformanceCommission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
renewalYearPerformanceCommission.setEffectiveDate(withdrawLabelInfo.getEffectiveStartDate());//生效时间
renewalYearPerformanceCommission.setInsurance_Cust(withdrawLabelInfo.getInsuredName());//投保人
renewalYearPerformanceCommission.setPolicyno(withdrawLabelInfo.getPolicyNo());//保单号
renewalYearPerformanceCommission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
renewalYearPerformanceCommission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费
if ("C06".equals(withdrawLabelInfo.getDropOptionCode())) { if ("C06".equals(withdrawLabelInfo.getDropOptionCode())) {
c06List.add(renewalYearPerformanceCommission); c06List.add(renewalYearPerformanceCommission);
} }
......
yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java
...@@ -150,7 +150,10 @@ public class WithdrawLabelInfo { ...@@ -150,7 +150,10 @@ public class WithdrawLabelInfo {
*佣金来源的计算公式 *佣金来源的计算公式
*/ */
private String calculationFormula; private String calculationFormula;
/**
*计算公式拆分出来的rate
*/
private BigDecimal calculationRate;
} }
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java
...@@ -9,6 +9,12 @@ public class RenewalYearPerformanceCommission { ...@@ -9,6 +9,12 @@ public class RenewalYearPerformanceCommission {
private String Commission; private String Commission;
private String Comments; private String Comments;
private String calculationFormula;//佣金计算公式 private String calculationFormula;//佣金计算公式
private String Customer;//保险公司
private String EffectiveDate;//生效时间
private String Insurance_Cust;//投保人
private String Policyno;//保单号
private int YearPREMIUM;//保费
private String Salestaff;//经纪人
/** /**
*薪资类型code *薪资类型code
*/ */
...@@ -72,4 +78,52 @@ public class RenewalYearPerformanceCommission { ...@@ -72,4 +78,52 @@ public class RenewalYearPerformanceCommission {
public void setSalaryCode(String salaryCode) { public void setSalaryCode(String salaryCode) {
this.salaryCode = salaryCode; this.salaryCode = salaryCode;
} }
public String getCustomer() {
return Customer;
}
public void setCustomer(String customer) {
Customer = customer;
}
public String getEffectiveDate() {
return EffectiveDate;
}
public void setEffectiveDate(String effectiveDate) {
EffectiveDate = effectiveDate;
}
public String getInsurance_Cust() {
return Insurance_Cust;
}
public void setInsurance_Cust(String insurance_Cust) {
Insurance_Cust = insurance_Cust;
}
public String getPolicyno() {
return Policyno;
}
public void setPolicyno(String policyno) {
Policyno = policyno;
}
public int getYearPREMIUM() {
return YearPREMIUM;
}
public void setYearPREMIUM(int yearPREMIUM) {
YearPREMIUM = yearPREMIUM;
}
public String getSalestaff() {
return Salestaff;
}
public void setSalestaff(String salestaff) {
Salestaff = salestaff;
}
} }
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
...@@ -279,6 +279,7 @@ ...@@ -279,6 +279,7 @@
<result column="remark" jdbcType="VARCHAR" property="remark"/> <result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="commissionType" jdbcType="VARCHAR" property="commissionType"/> <result column="commissionType" jdbcType="VARCHAR" property="commissionType"/>
<result column="calculationFormula" jdbcType="VARCHAR" property="calculationFormula"/> <result column="calculationFormula" jdbcType="VARCHAR" property="calculationFormula"/>
<result column="calculationRate" jdbcType="DECIMAL" property="calculationRate" />
</resultMap> </resultMap>
<select id="transformForWithdrawLabel" <select id="transformForWithdrawLabel"
parameterType="com.yd.dal.entity.agms.fortune.WithdrawQueryInfo" parameterType="com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
...@@ -366,7 +367,8 @@ ...@@ -366,7 +367,8 @@
f.commission_type commissionType, f.commission_type commissionType,
f.referral_amount referralAmount, f.referral_amount referralAmount,
f.calculation_formula calculationFormula, f.calculation_formula calculationFormula,
f.withdrawed_id withdrawId f.withdrawed_id withdrawId,
if(f.calculation_rate is null,0,f.calculation_rate) calculationRate
from ag_acl_customer_fortune f from ag_acl_customer_fortune f
left join ag_po_order o on o.id = f.order_id left join ag_po_order o on o.id = f.order_id
left join ag_product_plan pp on pp.id = o.plan_id left join ag_product_plan pp on pp.id = o.plan_id
......
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