Merge branch 'dev_jzg_lipf_v20260622'

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

@@ -13,6 +13,8 @@ import java.util.List;
 @Schema(description = "费用管理")
 public class CostManagementVo {
 
+    @Schema(description = "规则ID")
+    private String ruleId;
 
     @Schema(description = "审核人姓名")
     private String auditPersonName;

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4Platform.java

@@ -37,15 +37,15 @@ public class ExcelContent4Platform implements InsuranceData {
     private String jyPolicyNo;
 
     @Schema(description = "交强险入口比例")
-    @ExcelProperty(value = "交强险入口比例（%）", index = 4)
+    @ExcelProperty(value = "交强险入口比例", index = 4)
     private String jqInletRatio;
 
     @Schema(description = "商业险入口比例")
-    @ExcelProperty(value = "商业险入口比例（%）", index = 5)
+    @ExcelProperty(value = "商业险入口比例", index = 5)
     private String syInletRatio;
 
     @Schema(description = "非车险入口比例")
-    @ExcelProperty(value = "非车险入口比例（%）", index = 6)
+    @ExcelProperty(value = "非车险入口比例", index = 6)
     private String jyInletRatio;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateFollow.java

@@ -39,15 +39,15 @@ public class ExcelContent4PrivateFollow implements Serializable {
     private String jyPolicyNo;
 
     @Schema(description = "交强险跟单费比例")
-    @ExcelProperty(value = "交强险跟单费比例（%）", index = 4)
+    @ExcelProperty(value = "交强险跟单费比例", index = 4)
     private String jqOtherCostsProportion;
 
     @Schema(description = "商业险跟单费比例")
-    @ExcelProperty(value = "商业险跟单费比例（%）", index = 5)
+    @ExcelProperty(value = "商业险跟单费比例", index = 5)
     private String syOtherCostsProportion;
 
     @Schema(description = "非车险跟单费比例")
-    @ExcelProperty(value = "非车险跟单费比例（%）", index = 6)
+    @ExcelProperty(value = "非车险跟单费比例", index = 6)
     private String jyOtherCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateSuperviseCar.java

@@ -34,12 +34,12 @@ public class ExcelContent4PrivateSuperviseCar implements InsuranceData {
     private String syPolicyNo;
 
     @Schema(description = "交强险手续费比例")
-    @ExcelProperty(value = "交强险手续费比例（%）", index = 3)
+    @ExcelProperty(value = "交强险手续费比例", index = 3)
     private String jqSuperviseCostsProportion;
 
 
     @Schema(description = "商业险手续费比例")
-    @ExcelProperty(value = "商业险手续费比例（%）", index = 4)
+    @ExcelProperty(value = "商业险手续费比例", index = 4)
     private String sySuperviseCostsProportion;
 
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateSuperviseNoCar.java

@@ -31,7 +31,7 @@ public class ExcelContent4PrivateSuperviseNoCar implements InsuranceData {
 
 
     @Schema(description = "非车险手续费比例")
-    @ExcelProperty(value = "非车险手续费比例（%）", index = 2)
+    @ExcelProperty(value = "非车险手续费比例", index = 2)
     private String jySuperviseCostsProportion;
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -2615,13 +2615,20 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if(StrUtil.isNotEmpty(incomeAbanda)){
             errrMsg.append("车牌号为").append(incomeAbanda).append("的应收数据不存在. ");
         }
+
+        String settlementedDatas  = datas.stream().filter(action -> StrUtil.isNotEmpty(action.getOrderNo())).filter(action-> action.getInsPlyIncome() != null)
+                .filter(action -> "1".equals(action.getInsPlyIncome().getSettlementStatus())).map(ImportContentExt::getLicenseNo).collect(Collectors.joining("，"));
+        if(StrUtil.isNotEmpty(settlementedDatas)){
+            errrMsg.append("车牌号为").append(settlementedDatas).append("的应收数据已结算.");
+        }
+
         if("20".equals(type)){
-//            List<String> contactPersons = datas.stream().map(ImportContentExt::getContactPerson).filter(Objects::nonNull).distinct().toList();
-//            if(CollUtil.size(contactPersons) > 1){
-//                errrMsg.append("该批数据的对接人不唯一");
-//            }else if(CollUtil.isEmpty(contactPersons)){
-//                errrMsg.append("该批数据的对接人为空");
-//            }
+            List<String> contactPersons = datas.stream().map(ImportContentExt::getContactPerson).filter(Objects::nonNull).distinct().toList();
+            if(CollUtil.size(contactPersons) > 1){
+                errrMsg.append("该批数据的对接人不唯一. ");
+            }else if(CollUtil.isEmpty(contactPersons)){
+                errrMsg.append("该批数据的对接人为空");
+            }
         }else if("11".equals(type) || "12".equals(type)){
             List<String> parternerCompanyIds = datas.stream().map(ImportContentExt::getParternerCompanyId).filter(Objects::nonNull).distinct().toList();
             if(CollUtil.size(parternerCompanyIds) > 1){
@@ -2631,6 +2638,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             }
         }
 
+
         for (ImportContentExt data : datas) {
             boolean all = false;
             boolean jq = false;

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

@@ -357,6 +357,8 @@
 
     <select id="pageList" resultMap="CostManagementVoMap">
         SELECT
+            pc.id as cost_id,
+            pr_raw.id as ruld_id,
             pc.audit_time,
             pc.audit_person,
             pc.product_id,