Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

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

@@ -51,13 +51,14 @@ public class InsPlyIncome extends BaseModel {
     private String productName;
 
     @Schema(description = "险种")
-    @ExcelProperty("险种")
+    @ExcelProperty("险种编码")
     @ExcelIgnore
     private String riskCode;
 
     @Schema(description = "签单时间")
     //@TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty("签单时间")
     private LocalDateTime signingTime;
 
     @Schema(description = "签单年份")
@@ -67,6 +68,7 @@ public class InsPlyIncome extends BaseModel {
 
     @Schema(description = "签单日期 yyyy-mm-dd 格式")
     @TableField(exist = false)
+    @ExcelProperty("签单日期")
     @ExcelIgnore
     private String signDate;
 
@@ -267,6 +269,7 @@ public class InsPlyIncome extends BaseModel {
     private String contactPerson;
 
     @Schema(description = "对接人手机号")
+    @ExcelProperty("对接人手机号")
     private String contactPersonPhone;
 
     public String getDockingPerson(){
@@ -282,6 +285,7 @@ public class InsPlyIncome extends BaseModel {
     private String businessSource;
 
     @Schema(description = "结算时间")
+    @ExcelProperty("结算时间")
     private LocalDateTime settlementTime;
 
     // 设置初始值为0， 未结算
@@ -375,15 +379,16 @@ public class InsPlyIncome extends BaseModel {
 
     @TableField(exist = false)
     @Schema(description = "非车应收金额")
+    @ExcelProperty("非车应收金额")
     private BigDecimal jyTotalPremiums;
 
     @TableField(exist = false)
     @Schema(description = "合作保险公司ID")
+    @ExcelIgnore
     private String partnerCompanyId;
 
     @TableField(exist = false)
     @Schema(description = "禁用标志：1-已对账（禁用），0-未对账（可用）")
+    @ExcelIgnore
     private String disableFlag;
-
-
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -387,8 +387,7 @@ public class QuoteVerificationAspect {
         saveRatio(insFeeOrders, agreementInfoVo, jqCostType, syCostType, jyCostType, isrecordByLeader);
         calculateTotalPremium(insFeeOrders, distributionDiff);
 
-
-
+        insFeeOrders.setSystemCode(baseController.getSystemCode());
         insFeeOrdersService.save(insFeeOrders);
         return insFeeOrders;
     }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -310,7 +310,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         InsFeeOrders feeOrders = BeanUtil.copyProperties(feeOrdersVo, InsFeeOrders.class);
         feeOrders.setOrderNo(quoteNo);
-        feeOrders.setSystemCode(systemCode);
+        feeOrders.setSystemCode(baseController.getSystemCode());
         insFeeOrdersMapper.insertOrUpdate(feeOrders);
     }
 

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

@@ -338,11 +338,22 @@
             where sujis.type_attr =#{receivableQueryVo.typeAttr})
         </if>
         <if test="receivableQueryVo.invoiceSettlementStatus != null and receivableQueryVo.invoiceSettlementStatus != ''">
-            AND ipi.id  in (
-            select ipil.income_id  from ins_ply_income_invoice_link ipil
-            LEFT JOIN ins_ply_income_invoice ipii ON ipil.invoice_id = ipii.id AND ipii.is_delete = 0
-            where ipii.status = #{receivableQueryVo.invoiceSettlementStatus} and ipil.is_delete = 0
-            )
+            <!-- 当状态为1时，查询已开票的数据 -->
+            <if test="receivableQueryVo.invoiceSettlementStatus != '2'">
+                AND ipi.id in (
+                select ipil.income_id from ins_ply_income_invoice_link ipil
+                LEFT JOIN ins_ply_income_invoice ipii ON ipil.invoice_id = ipii.id AND ipii.is_delete = 0
+                where ipii.status = #{receivableQueryVo.invoiceSettlementStatus} and ipil.is_delete = 0
+                )
+            </if>
+            <!-- 当状态为2时，查询未开票的数据 -->
+            <if test="receivableQueryVo.invoiceSettlementStatus == '2'">
+                AND NOT EXISTS (
+                SELECT 1 FROM ins_ply_income_invoice_link link
+                LEFT JOIN ins_ply_income_invoice inv ON link.invoice_id = inv.id AND inv.is_delete = 0
+                WHERE link.income_id = ipi.id AND link.is_delete = 0
+                )
+            </if>
         </if>
         <if test = "receivableQueryVo.agreementType != null and receivableQueryVo.agreementType != ''">
             AND ipi.agreement_type = #{receivableQueryVo.agreementType}