Merge branch 'dev_jzg_lipf_v20260518'

commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementReportQueryVo.java

@@ -48,4 +48,7 @@ public class SettlementReportQueryVo extends PageRequest {
 
     @Schema(description = "对接人")
     private String receiver;
+
+    @Schema(description = "开票状态 0-未开票 1-已开票")
+    private String invoiceStatus;
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -209,7 +209,7 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
      * @date 2026/6/1 16:57
      */
     List<CompanySuperviseSettlementReportDto> queryCumulativeAccountsReceivable(@Param("systemCode") String systemCode,
-                                                                                @Param("agreementType") String agreementType);
+                                                                                @Param("vo") SettlementReportQueryVo vo);
 
     /**
      * 查询已开票金额

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

@@ -3106,7 +3106,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         log.info("保险公司结算报表查询-区分租户并且按照日期进行过滤：systemCode=[{}],queryVo=[{}]", systemCode, JSONUtil.toJsonStr(queryVo));
         // 1. 先将有数据的保险公司进行汇总
         // 累计应收金额， 应收手续费（手续费）， 应收手续费（手续费）
-        List<CompanySuperviseSettlementReportDto> allCompaniesIncomeDatas = baseMapper.queryCumulativeAccountsReceivable(systemCode, queryVo.getAgreementType());
+        List<CompanySuperviseSettlementReportDto> allCompaniesIncomeDatas = baseMapper.queryCumulativeAccountsReceivable(systemCode, queryVo);
         allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action-> action.setId(action.getCompanyId())).toList();
         // for test, 查看一家公司的数据，将不可变对象变成 可变对象
 //        allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().filter(action-> "1738811735599338932".equals(action.getCompanyId())).toList();
@@ -3114,7 +3114,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if (CollUtil.isEmpty(allCompaniesIncomeDatas)) {
             String msg = String.format("租户%s下暂时没有手续费",systemCode);
             log.info(msg);
-            return HttpResult.error(msg, Collections.emptyList());
+            return HttpResult.ok(msg, Collections.emptyList());
         }
         // add by lipf, 前端保险公司的查询条件未生效，进行bug修复
         if(StrUtil.isNotEmpty(queryVo.getCompanyId())){

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

@@ -533,7 +533,6 @@
         ipii.invoice_type,
         ipii.invoice_party,
         ipii.tax_point,
-        ipi.order_no as orderNo,
         ipiis.actual_received_amount,
         ipii.receivable_supervise_premium,
         ipiis.receive_payment_date,
@@ -591,6 +590,19 @@
                 AND ipiis.create_time <= date(#{settlementQueryVo.settlementDateEndStr})
             </if>
         </where>
+        group by
+        ipiis.id ,
+        ipiis.invoice_id,
+        io.company_id,
+        io.company_name,
+        ipii.invoice_type,
+        ipii.invoice_party,
+        ipii.tax_point,
+        ipiis.actual_received_amount,
+        ipii.receivable_supervise_premium,
+        ipiis.receive_payment_date,
+        ipiis.create_by ,
+        ipiis.create_time
         order by ipiis.create_time desc
     </select>
 
@@ -1612,8 +1624,8 @@
         <where>
             ipi.is_delete = 0
             and ipi.system_code = #{systemCode}
-            <if test="agreementType != null and agreementType != ''">
-                AND ipi.agreement_type = #{agreementType}
+            <if test="vo.agreementType != null and vo.agreementType != ''">
+                AND ipi.agreement_type = #{vo.agreementType}
             </if>
         </where>
         group by