فهرست منبع

1.财务结算添加维护人

wuhp 1 سال پیش
والد
کامیت
c3ab9076fd

+ 8 - 0
src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -337,6 +337,14 @@ public class InsPlyIncome implements Serializable {
     @TableField("task_id")
     private String taskId;
 
+    @ApiModelProperty("领导人工号")
+    @TableField("leader_id")
+    private String leaderId;
+
+    @ApiModelProperty("领导人名称")
+    @TableField("leader_name")
+    private String leaderName;
+
     @ApiModelProperty("开票方式 0 保司开票 1掌柜开票")
     @TableField("invoicing_method")
     private String invoicingMethod;

+ 12 - 2
src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -169,7 +169,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         if (StringUtils.isNotEmpty(agreeType)) {
 //            判断协议类型 平台  保险
             if ("1".equals(agreeType)) {
-                this.savePinTai(order, insFeeOrderNew, insAreaCompany);  //手续费不分非车不非车 跟单也不分
+                this.savePinTai(order, insFeeOrderNew, insAreaCompany, leaderId, leaderName);  //手续费不分非车不非车 跟单也不分
             } else {  // 保险  逻辑: 手续费生成一条  跟单费生成一条   非车手续费一条  非车跟单费一条
                 if (((insFeeOrderNew.getJqSuperviseCostsPremiums() != null && insFeeOrderNew.getJqSuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0)) || (insFeeOrderNew.getSySuperviseCostsPremiums() != null && insFeeOrderNew.getSySuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0)) { //手续费
                     this.saveInsuranceProcedures(order, insFeeOrderNew, insAreaCompany, leaderId, leaderName);
@@ -222,6 +222,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setAllFeeValue(insFeeOrderNew.getNoOtherCostsPremiums());
         insPlyIncome.setNoOtherCostsPremium(insFeeOrderNew.getNoOtherCostsPremiums());
         insPlyIncome.setNoOtherCostsProportion(insFeeOrderNew.getNoOtherCostsProportion());
+        insPlyIncome.setLeaderId(leaderId);
+        insPlyIncome.setLeaderName(leaderName);
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
 
         this.getDeptId(insPlyIncome);
@@ -270,6 +272,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setSyEndDate(StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate()));
         insPlyIncome.setNoSuperviseCostsPremiums(insFeeOrderNew.getNoSuperviseCostsPremiums());
         insPlyIncome.setNoSuperviseCostsProportion(insFeeOrderNew.getNoSuperviseCostsProportion());
+        insPlyIncome.setLeaderId(leaderId);
+        insPlyIncome.setLeaderName(leaderName);
 
         this.getDeptId(insPlyIncome);
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
@@ -335,6 +339,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setJqEndDate(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()));
         insPlyIncome.setSyStartDate(StringOperations.emptyStringToNull(insAreaCompany.getSyStartDate()));
         insPlyIncome.setSyEndDate(StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate()));
+        insPlyIncome.setLeaderId(leaderId);
+        insPlyIncome.setLeaderName(leaderName);
         insPlyIncome.setUserId(insFeeOrderNew.getUserId());
         insPlyIncome.setInsuredName(order.getInsuredname());
         insPlyIncome.setReceivableAmount(otherAmount);
@@ -384,6 +390,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setSyStartDate(StringOperations.emptyStringToNull(insAreaCompany.getSyStartDate()));
         insPlyIncome.setSyEndDate(StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate()));
         insPlyIncome.setReceivableAmount(handlingAmount);
+        insPlyIncome.setLeaderId(leaderId);
+        insPlyIncome.setLeaderName(leaderName);
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
         this.getDeptId(insPlyIncome);
         baseMapper.insert(insPlyIncome);
@@ -451,7 +459,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         return null;
     }
 
-    private void savePinTai(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+    private void savePinTai(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany,String leaderId,String leaderName) {
         BigDecimal handlingAmount = this.calculateTotal(insFeeOrderNew.getJqSuperviseCostsPremiums(),
                 insFeeOrderNew.getSySuperviseCostsPremiums(), insFeeOrderNew.getNoSuperviseCostsPremiums());  //手续费
         BigDecimal handlingProportion = this.calculateTotal(insFeeOrderNew.getJqSuperviseCostsProportion(),
@@ -504,6 +512,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setJqEndDate(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()));
         insPlyIncome.setSyStartDate(StringOperations.emptyStringToNull(insAreaCompany.getSyStartDate()));
         insPlyIncome.setSyEndDate(StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate()));
+        insPlyIncome.setLeaderId(leaderId);
+        insPlyIncome.setLeaderName(leaderName);
         this.getDeptId(insPlyIncome);
         //add by hxl  2024-07-31  修改插入结算表中险种信息错误的bug  将大订单中的险种信息改为小订单的险种信息
         this.saveRiskCode(insAreaCompany.getProductid(), insPlyIncome);