1.平台结算添加对接人

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -388,6 +388,10 @@ public class InsPlyIncome implements Serializable {
     @TableField(exist = false)
     private String userName;
 
+    @ApiModelProperty("对接人")
+    @TableField(exist = false)
+    private String dockingPerson;
+
 
     public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDate createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
         this.orderno = orderno;

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1408,6 +1408,11 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         for (InsPlyIncome item :insPlyIncomes){
             SettlementFeesExcel bxSettlementFeesExcel = new SettlementFeesExcel();
             BeanUtils.copyProperties(item, bxSettlementFeesExcel);
+            if("1".equals(item.getHandlingFeesStatus())){
+                bxSettlementFeesExcel.setHandlingFeesStatus("已结算");
+            }else {
+                bxSettlementFeesExcel.setHandlingFeesStatus("未结算");
+            }
             resultList.add(bxSettlementFeesExcel);
         }
         String uploadPath = this.uploadPath + "/excel/";

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -261,6 +261,9 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("保司机构")
     private String partnerCompaniesName;
 
+    @ApiModelProperty("对接人")
+    private String dockingPerson;
+
     @ApiModelProperty("选择ids")
     private List<String> selectIds;
 

src/main/java/com/ydtech/modules/ins/model/vo/res/SettlementFeesExcel.java

@@ -97,7 +97,7 @@ public class SettlementFeesExcel implements Serializable {
     private BigDecimal jqOtherCostsProportion;
 
     @ApiModelProperty("商业应收比例")
-    @ExcelProperty("交强非跟单比例")
+    @ExcelProperty("商业应收比例")
     private BigDecimal syReceivableProportion;
 
     @ApiModelProperty("商业手续费比例")
@@ -152,9 +152,9 @@ public class SettlementFeesExcel implements Serializable {
     private String settlementUserName;
 
 
-    @ApiModelProperty("结算人")
-    @ExcelProperty("结算人")
-    private String updateUserName;
+//    @ApiModelProperty("结算人")
+//    @ExcelProperty("结算人")
+//    private String updateUserName;
 
 
     @ApiModelProperty("手续费结算状态  1 为已结算  2 已经结算")

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -140,6 +140,7 @@
             select
                 pa.agreement_name  as "agreementName",
                 pa.agreement_type  as "agreementType",
+                pa.docking_person  as "dockingPerson",
                 su.name  as "userName",
                 <include refid="income_com"/>
                 from  ins_ply_income a