202201:薪资单:calculation_amount 匹配佣奖率的金额2

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -1237,6 +1237,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     renewalYearPerformanceCommission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
                     renewalYearPerformanceCommission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费
                     renewalYearPerformanceCommission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
+                    renewalYearPerformanceCommission.setSalesCommissionRate(withdrawLabelInfo.getCommissionRate().doubleValue());
 
 
                     if ("C06".equals(withdrawLabelInfo.getDropOptionCode())) {

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java

@@ -25,6 +25,9 @@ public class RenewalYearPerformanceCommission {
      *薪资类型code
      */
     private String salaryCode;
+
+    private double SalesCommissionRate;
+
     public RenewalYearPerformanceCommission() {
     }
 
@@ -147,4 +150,12 @@ public class RenewalYearPerformanceCommission {
     public void setCalculationAmount(Double calculationAmount) {
         this.calculationAmount = calculationAmount;
     }
+
+    public double getSalesCommissionRate() {
+        return SalesCommissionRate;
+    }
+    @JsonProperty("SalesCommissionRate")
+    public void setSalesCommissionRate(double salesCommissionRate) {
+        SalesCommissionRate = salesCommissionRate;
+    }
 }

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -400,7 +400,7 @@
                  left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
                  left join ag_acl_practitioner pra  on pra.customer_id = f.customer_id and f.sale_practitioner_id=pra.id
                  left join ag_acl_life_insurance_practitioner lifepra on f.sale_practitioner_id=lifepra.practitioner_id and lifepra.order_id=o.id
-                 inner join ag_acl_practitioner_setting setting on pra.id = setting.practitioner_id
+                 inner join ag_acl_practitioner_setting setting on f.practitioner_id = setting.practitioner_id
                  left join ag_md_drop_options op
                  left join ag_md_drop_master mas on mas.id = op.drop_master_id on op.drop_option_code = f.commission_payout_status
 
@@ -412,7 +412,7 @@
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
         </if>
         <if test="item.practitionerId != null">
-            and pra.id = #{item.practitionerId,jdbcType=BIGINT}
+            and f.practitioner_id = #{item.practitionerId,jdbcType=BIGINT}
         </if>
 
     </select>