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

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

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

@@ -5327,6 +5327,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         // 1. 先将有数据的保险公司进行汇总
         // 累计应收金额， 应收手续费（手续费）
         List<CompanySuperviseSettlementReportDto> allCompaniesIncomeDatas = baseMapper.queryCumulativeAccountsReceivable(systemCode, queryVo);
+        // 结算状态在上面的sql进行过筛选了，后面就不再筛选了
+        queryVo.setStatus(null);
         if("20".equals(queryVo.getAccountsReceivable())){
             allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action->{
                 // 统计非车的手续费

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

@@ -1941,6 +1941,14 @@
             <if test="vo.agreementType != null and vo.agreementType != ''">
                 AND ipi.agreement_type = #{vo.agreementType}
             </if>
+            <if test="vo.status != null">
+                <if test="vo.status == 1">
+                    AND ipi.settlement_time IS NOT NULL
+                </if>
+                <if test="vo.status == 0">
+                    AND ipi.settlement_time IS NULL
+                </if>
+            </if>
             <if test="vo.signingStartTime != null and vo.signingStartTime != '' and vo.signingEndTime != null and vo.signingEndTime != ''">
                 AND DATE(ipi.signing_time) between #{vo.signingStartTime} and #{vo.signingEndTime}
             </if>