Merge branch 'dev_jzg_lipf_v20260622'

commons/src/main/java/com/jzg/commons/entity/dto/CostManagementVo.java

@@ -98,4 +98,8 @@ public class CostManagementVo {
     @Schema(description = "协议描述")
     private String agreementName;
 
+    @Schema(description = "出单账号简称")
+    private String userAbbr;
+
+    private String attributionId;
 }

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -66,6 +66,11 @@ public class InsPlyIncome extends BaseModel {
     @ExcelIgnore
     private String signYear;
 
+    @Schema(description = "签单月份")
+    @TableField(exist = false)
+    @ExcelIgnore
+    private String signMonth;
+
     @Schema(description = "签单日期 yyyy-mm-dd 格式")
     @TableField(exist = false)
     @ExcelProperty("签单日期")
@@ -397,6 +402,11 @@ public class InsPlyIncome extends BaseModel {
     @ExcelIgnore
     private String partnerCompanyId;
 
+    @TableField(exist = false)
+    @ExcelIgnore
+    @Schema(description = "1-手续费, 2-跟单费, 3-驾意险手续费, 4-驾意险跟单费, 5-平台应收-车险, 6-平台应收-非车险")
+    private String invoiceType;
+
     @TableField(exist = false)
     @Schema(description = "禁用标志：1-已对账（禁用），0-未对账（可用）")
     @ExcelIgnore

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -74,6 +74,7 @@ public class InsOrdersController extends BaseController {
     @Operation(summary = "录入订单新增")
     @PostMapping("saveOrders")
     public HttpResult saveOrUpdate(@RequestBody InsOrdersAdd ordersAdd) {
+        log.info("补录订单。 saveOrUpdate=[{}]", JSONUtil.toJsonStr(ordersAdd));
         ordersAdd.setSystemCode(getSystemCode());
         return insOrdersService.saveOrders(ordersAdd);
     }

tenant/organization/src/main/java/com/jzg/organization/utils/IncomeInvoiceLinkUtil.java

@@ -7,6 +7,7 @@ import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.map.MapUtil;
 import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceLink;
 import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceSettlement;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,12 +30,12 @@ public class IncomeInvoiceLinkUtil {
                                                                           InsPlyIncomeInvoiceLinkMapper linkMapper,
                                                                           InsPlyIncomeInvoiceSettlementMapper settlementMapper) {
         if (CollUtil.isEmpty(incomeIdList)) {
-            return null;
+            return MapUtil.empty();
         }
 
         List<InsPlyIncomeInvoiceLink> invoiceLinkList = getInvoiceLinkList(incomeIdList, linkMapper);
         if (CollUtil.isEmpty(invoiceLinkList)) {
-            return null;
+            return MapUtil.empty();
         }
 
         // 2、拿到所有invoiceId
@@ -73,12 +74,13 @@ public class IncomeInvoiceLinkUtil {
 
         List<InsPlyIncomeInvoiceLink> invoiceLinkList = getInvoiceLinkList(incomeIdList, linkMapper);
         if (CollUtil.isEmpty(invoiceLinkList)) {
-            return null;
+            return MapUtil.empty();
         }
 
         // 按incomeId分组，一个income可能多条link
-        return invoiceLinkList.stream()
+        Map<String, List<InsPlyIncomeInvoiceLink>> invoiceLinkMap = invoiceLinkList.stream()
                 .collect(Collectors.groupingBy(InsPlyIncomeInvoiceLink::getIncomeId));
+        return invoiceLinkMap;
     }
 
 

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -357,6 +357,8 @@
 
     <select id="pageList" resultMap="CostManagementVoMap">
         SELECT
+            pa.attribution_id,
+            (select paa.user_abbr  from ptl_agreement_attribution paa where paa.id  = pa.attribution_id  ) as user_abbr,
             pc.id as cost_id,
             pr_raw.id as ruld_id,
             pc.audit_time,