薪资单加预扣率

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

@@ -438,7 +438,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<PayScaleInfo> resultList = new ArrayList<>();
         // 应发佣金
         Double monDtlAmount = 0D;
-        // 应发佣金
+        // 实发佣金
         Double monDtlRAmount = 0D;
         // loginName等
         String loginName = null;
@@ -451,7 +451,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             List<SalaryDetails> list = group.get(key);
             if (CollectionUtils.isNotEmpty(list)) {
                 monDtlAmount = list.get(0).getSumcommission();
-                monDtlRAmount = list.get(0).getTax_free_comis();
+                monDtlRAmount = list.get(0).getAfter_tax_comis();
                 loginName = list.get(0).getLoginName();
                 years = String.valueOf(list.get(0).getYear());
                 month = String.valueOf(list.get(0).getMonth());
@@ -777,6 +777,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             // 代扣个人所得税
             Double total_tax = salaryDetailsList.get(0).getTotal_tax();
             responseVO.setD(total_tax.toString());
+            // 预扣率
+            String rate = this.getRate(salaryDetailsList.get(0).getTotal_commission());
+            responseVO.setRate(rate);
             // 佣金合计
             for (SalaryDetails item : salaryDetailsList) {
                 abc = abc.add(BigDecimal.valueOf(item.getCommission()));
@@ -794,6 +797,24 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return responseVO;
     }
 
+    private String getRate(Double total_commission) {
+        long l = (long) (total_commission * 100);
+        if (0 < l && l <= 3600000) {
+            return "3";
+        } else if (3600000 < l && l <= 14400000) {
+            return "10";
+        } else if (14400000 < l && l <= 30000000) {
+            return "20";
+        } else if (30000000 < l && l <= 42000000) {
+            return "25";
+        } else if (42000000 < l && l <= 66000000) {
+            return "30";
+        } else if (66000000 < l && l <= 96000000) {
+            return "35";
+        }
+        return "45";
+    }
+
     private void getResponseMessage(OrganizationQueryResponseVO responseVO, List<PractitionerSubordinateSystemInfo> subordinateSystemInfoList, List<InsurerBranchDeptInfo> insurerBranchDeptInfoList, List<InsurerBranchInfo> insurerBranchInfoList) {
         Map<String,List<PractitionerSubordinateSystemInfo>> systemMap = new HashMap<>();
         List<PractitionerSubordinateSystemInfo> systemInfoList;

yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailResponseVO.java

@@ -10,6 +10,7 @@ import java.util.List;
 public class QuerySalaryDetailResponseVO {
     private String abc; //佣金合计
     private String d; //代扣个人所得税
+    private String rate; //预扣率
     private List<SalaryDetail> list;
     private CommonResult commonResult;
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/n22/SalaryDetail.java

@@ -13,6 +13,7 @@ public class SalaryDetail {
     private Double total_personal_tax;//累计应扣所得税
     private Double total_paid;//累计已扣所得税
     private Double total_tax;//本期应扣所得税
+    private Double personal_tax;
 
     private Double after_tax_comis;//税后应发
 }

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

@@ -61,5 +61,6 @@ public class SalaryDetails {
     private Double total_personal_tax;
     private Double total_paid;
     private Double total_tax;
+    private Double personal_tax;
     private Double after_tax_comis;
 }

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

 package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
 
-@Data
+
 public class Commission {
     private String Customer;
 
@@ -21,7 +20,6 @@ public class Commission {
 
     private double SalesCommissionRate;
 
-    @JSONField(name="FYC/RYC")
     private double FYC_RYC;
 
     private String Level;
@@ -35,4 +33,125 @@ public class Commission {
     private String SaleSystem;
 
     private String Comments;
+
+    public String getCustomer() {
+        return Customer;
+    }
+
+    public void setCustomer(String customer) {
+        Customer = customer;
+    }
+
+    public String getPolicyno() {
+        return Policyno;
+    }
+
+    public void setPolicyno(String policyno) {
+        Policyno = policyno;
+    }
+
+    public String getPol_name_chn() {
+        return Pol_name_chn;
+    }
+
+    public void setPol_name_chn(String pol_name_chn) {
+        Pol_name_chn = pol_name_chn;
+    }
+
+    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 int getYear() {
+        return Year;
+    }
+
+    public void setYear(int year) {
+        Year = year;
+    }
+
+    public int getYearPREMIUM() {
+        return YearPREMIUM;
+    }
+
+    public void setYearPREMIUM(int yearPREMIUM) {
+        YearPREMIUM = yearPREMIUM;
+    }
+
+    public double getSalesCommissionRate() {
+        return SalesCommissionRate;
+    }
+
+    public void setSalesCommissionRate(double salesCommissionRate) {
+        SalesCommissionRate = salesCommissionRate;
+    }
+
+    public double getFYC_RYC() {
+        return FYC_RYC;
+    }
+
+    @JSONField(name="FYC/RYC")
+    public void setFYC_RYC(double FYC_RYC) {
+        this.FYC_RYC = FYC_RYC;
+    }
+
+    public String getLevel() {
+        return Level;
+    }
+
+    public void setLevel(String level) {
+        Level = level;
+    }
+
+    public int getRate() {
+        return Rate;
+    }
+
+    public void setRate(int rate) {
+        Rate = rate;
+    }
+
+    public double getCommission() {
+        return Commission;
+    }
+
+    public void setCommission(double commission) {
+        Commission = commission;
+    }
+
+    public String getSalestaff() {
+        return Salestaff;
+    }
+
+    public void setSalestaff(String salestaff) {
+        Salestaff = salestaff;
+    }
+
+    public String getSaleSystem() {
+        return SaleSystem;
+    }
+
+    public void setSaleSystem(String saleSystem) {
+        SaleSystem = saleSystem;
+    }
+
+    public String getComments() {
+        return Comments;
+    }
+
+    public void setComments(String comments) {
+        Comments = comments;
+    }
 }

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

 package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
 
-@Data
 public class FirstYearPerformanceCommission {
     private String SaleSystem; //销售当前体系
-
-    @JSONField(name="FYC/RYC")
     private String FYC_RYC; //当前体系FYC
-
     private String BackCommission; //业绩回算FYC(含育成回算)
     private String T_BackCommission; //育成回算业绩FYC
     private String Rate; //绩效奖金比率%
     private String Commission;//首年度绩效奖金
     private String Comments; //备注
+
+    public String getSaleSystem() {
+        return SaleSystem;
+    }
+
+    public void setSaleSystem(String saleSystem) {
+        SaleSystem = saleSystem;
+    }
+
+    public String getFYC_RYC() {
+        return FYC_RYC;
+    }
+
+    @JSONField(name="FYC/RYC")
+    public void setFYC_RYC(String FYC_RYC) {
+        this.FYC_RYC = FYC_RYC;
+    }
+
+    public String getBackCommission() {
+        return BackCommission;
+    }
+
+    public void setBackCommission(String backCommission) {
+        BackCommission = backCommission;
+    }
+
+    public String getT_BackCommission() {
+        return T_BackCommission;
+    }
+
+    public void setT_BackCommission(String t_BackCommission) {
+        T_BackCommission = t_BackCommission;
+    }
+
+    public String getRate() {
+        return Rate;
+    }
+
+    public void setRate(String rate) {
+        Rate = rate;
+    }
+
+    public String getCommission() {
+        return Commission;
+    }
+
+    public void setCommission(String commission) {
+        Commission = commission;
+    }
+
+    public String getComments() {
+        return Comments;
+    }
+
+    public void setComments(String comments) {
+        Comments = comments;
+    }
 }

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

 package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
 
-@Data
 public class RecommendSystemCommission {
     private String SaleSystem;
-
-    @JSONField(name="FYC/RYC")
     private String FYC_RYC;
-
     private String Rate;
     private String Commission;
     private String Comments;
+
+    public String getSaleSystem() {
+        return SaleSystem;
+    }
+
+    public void setSaleSystem(String saleSystem) {
+        SaleSystem = saleSystem;
+    }
+
+    public String getFYC_RYC() {
+        return FYC_RYC;
+    }
+
+    @JSONField(name="FYC/RYC")
+    public void setFYC_RYC(String FYC_RYC) {
+        this.FYC_RYC = FYC_RYC;
+    }
+
+    public String getRate() {
+        return Rate;
+    }
+
+    public void setRate(String rate) {
+        Rate = rate;
+    }
+
+    public String getCommission() {
+        return Commission;
+    }
+
+    public void setCommission(String commission) {
+        Commission = commission;
+    }
+
+    public String getComments() {
+        return Comments;
+    }
+
+    public void setComments(String comments) {
+        Comments = comments;
+    }
 }

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

 package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
 
-@Data
 public class RenewalYearPerformanceCommission {
     private String SaleSystem;
-
-    @JSONField(name="FYC/RYC")
     private String FYC_RYC;
-
     private String Rate;
     private String Commission;
     private String Comments;
+
+    public String getSaleSystem() {
+        return SaleSystem;
+    }
+
+    public void setSaleSystem(String saleSystem) {
+        SaleSystem = saleSystem;
+    }
+
+    public String getFYC_RYC() {
+        return FYC_RYC;
+    }
+    @JSONField(name="FYC/RYC")
+    public void setFYC_RYC(String FYC_RYC) {
+        this.FYC_RYC = FYC_RYC;
+    }
+
+    public String getRate() {
+        return Rate;
+    }
+
+    public void setRate(String rate) {
+        Rate = rate;
+    }
+
+    public String getCommission() {
+        return Commission;
+    }
+
+    public void setCommission(String commission) {
+        Commission = commission;
+    }
+
+    public String getComments() {
+        return Comments;
+    }
+
+    public void setComments(String comments) {
+        Comments = comments;
+    }
 }