1. 报表添加字段

2. 详情添加合伙人的字段

src/main/java/com/ydtech/modules/order/entity/vo/AuditExportVo.java

@@ -5,12 +5,17 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 审核导出表 Vo
  */
 @Data
 public class AuditExportVo {
 
+    @ApiModelProperty("子订单id")
+    private String id;
+
     @ApiModelProperty("保险公司id")
     @ExcelIgnore
     private String companyId;
@@ -167,6 +172,21 @@ public class AuditExportVo {
     @ExcelProperty("非车利润差值")
     private String noProfitMarginPremiums;
 
+    @ApiModelProperty("创始人")
+    @ExcelProperty("创始人")
+    private BigDecimal source1;
+
+    @ApiModelProperty("管理人")
+    @ExcelProperty("管理人")
+    private BigDecimal source2;
+
+    @ApiModelProperty("合伙人")
+    @ExcelProperty("合伙人")
+    private BigDecimal source3;
+
+    @ApiModelProperty("工作室")
+    @ExcelProperty("工作室")
+    private BigDecimal source4;
 
     @ApiModelProperty("是否是补录订单")
     @ExcelProperty("补录订单")

src/main/java/com/ydtech/modules/order/service/impl/ExcelExportServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.dict.BusinessPropertyEnum;
 import com.ydtech.constants.enums.dict.BusinessSegmentsSZEnum;
 import com.ydtech.exception.SystemException;
@@ -9,10 +10,13 @@ import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.ExcelExportService;
+import com.ydtech.modules.partner.dao.PartnerPremiumDetailsMapper;
+import com.ydtech.modules.partner.model.PartnerPremiumDetails;
 import com.ydtech.utils.OrderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -75,6 +79,9 @@ public class ExcelExportServiceImpl implements ExcelExportService {
         return revenueExpenditureDetailList;
     }
 
+    @Autowired
+    PartnerPremiumDetailsMapper partnerPremiumDetailsMapper;
+
     /**
      * 获取财务审核明细列表
      * @param auditExportQueryVo
@@ -109,6 +116,29 @@ public class ExcelExportServiceImpl implements ExcelExportService {
             if (item.getThreeLevelUserId() == null || item.getThreeLevelUserId().equals("")){
                 item.setThirdDetailPremiums("0");
             }
+
+            List<PartnerPremiumDetails> partnerPremiumDetails = partnerPremiumDetailsMapper.selectList(new LambdaQueryWrapper<PartnerPremiumDetails>()
+                    .eq(PartnerPremiumDetails::getCompanyId, item.getId())
+                    .orderByAsc(PartnerPremiumDetails::getSource));
+
+
+
+            if(partnerPremiumDetails.size() > 0){
+                PartnerPremiumDetails partnerPremiumDetails1 = partnerPremiumDetails.stream().filter(x -> x.getSource() == 1).findFirst().get();
+                item.setSource1(partnerPremiumDetails1.getExtractFee());
+                PartnerPremiumDetails partnerPremiumDetails2 = partnerPremiumDetails.stream().filter(x -> x.getSource() == 2).findFirst().get();
+                item.setSource2(partnerPremiumDetails2.getExtractFee());
+                PartnerPremiumDetails partnerPremiumDetails3 = partnerPremiumDetails.stream().filter(x -> x.getSource() == 3).findFirst().get();
+                item.setSource3(partnerPremiumDetails3.getExtractFee());
+                PartnerPremiumDetails partnerPremiumDetails4 = partnerPremiumDetails.stream().filter(x -> x.getSource() == 4).findFirst().get();
+                item.setSource4(partnerPremiumDetails4.getExtractFee());
+            }else{
+                item.setSource1(new BigDecimal(0));
+                item.setSource2(new BigDecimal(0));
+                item.setSource3(new BigDecimal(0));
+                item.setSource4(new BigDecimal(0));
+            }
+
         });
         return auditExportList;
     }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -1248,6 +1248,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                         retailFee.setJqRetailPremiums(insFeeOrderNew.getJqPremium().multiply(new BigDecimal(item.getProportional()).divide(new BigDecimal(100))));
                         retailFee.setSyRetailPremiums(insFeeOrderNew.getSyPremium().multiply(new BigDecimal(item.getProportional()).divide(new BigDecimal(100))));
                         retailFee.setNoRetailPremiums(insFeeOrderNew.getNoPremium().multiply(new BigDecimal(item.getProportional()).divide(new BigDecimal(100))));
+                        retailFee.setTotalRetailPremiums(retailFee.getJqRetailPremiums().add(retailFee.getSyRetailPremiums()).add(retailFee.getNoRetailPremiums()));
                         retailFees.add(retailFee);
                     }
                 });

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1985,6 +1985,7 @@
 
     <select id="getAuditExportList" resultType="com.ydtech.modules.order.entity.vo.AuditExportVo">
         SELECT
+            iac.id,
             iac.company_id,
             iac.api_type,
             iac.cross_insurance,
@@ -2044,6 +2045,7 @@
         AND
             iac.orderstatus = 3
             GROUP BY
+                iac.id,
             io.orderno,
             iac.api_type,
             iac.cross_insurance,