lipf 4 месяцев назад
Родитель
Сommit
fd26a0f7bc

+ 8 - 0
commons/src/main/java/com/jzg/commons/core/page/HttpResult.java

@@ -51,6 +51,14 @@ public class HttpResult<T> implements Serializable {
         return r;
     }
 
+    public static <T> HttpResult<T> error(String msg, T data) {
+        HttpResult<T> r = new HttpResult<>();
+        r.setCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        r.setData(data);
+        r.setMsg(msg);
+        return r;
+    }
+
     public static <T> HttpResult<T> error(T data) {
         HttpResult<T> r = new HttpResult<>();
         r.setCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);

+ 14 - 2
commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementReportQueryVo.java

@@ -16,12 +16,24 @@ public class SettlementReportQueryVo extends PageRequest {
     @Schema(description = "保险公司id")
     private String companyId;
 
-    @Schema(description = "开始时间")
+    @Schema(description = "创建开始时间")
     private String startTime;
 
-    @Schema(description = "结束时间")
+    @Schema(description = "创建结束时间")
     private String endTime;
 
+    @Schema(description = "开票开始时间")
+    private String invoiceStartTime;
+
+    @Schema(description = "开票结束时间")
+    private String invoiceEndTime;
+
+    @Schema(description = "结算开始时间")
+    private String settlementStartTime;
+
+    @Schema(description = "开票结束时间")
+    private String settlementEndTime;
+
     @Schema(description = "结算状态")
     private String status;
 

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -508,7 +508,7 @@ public class ReceivableController {
     @PostMapping("companySuperviseSettlementReport")
     @Operation(summary = "保险公司结算报表")
     public HttpResult<List<CompanySuperviseSettlementReportDto>> companySuperviseSettlementReport(@RequestBody SettlementReportQueryVo settlementReportQueryVo) {
-        return HttpResult.ok(receivableService.companySuperviseSettlementReport(settlementReportQueryVo));
+        return receivableService.companySuperviseSettlementReport(settlementReportQueryVo);
     }
 
     @PostMapping("receiverSettlementReport")

+ 8 - 0
tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -195,4 +195,12 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
     Page<InvoiceRecordResult> getInvoiceRecordList(Page page, @Param("invoiceRecordQueryVo") InvoiceRecordQueryVo invoiceRecordQueryVo);
 
     List<CompanySuperviseSettlementReportDto> selectAllCompanyReports(@Param("queryVo") SettlementReportQueryVo queryVo);
+
+    /**
+     * 查询累计应收的金额
+     *
+     * @author lipf
+     * @date 2026/6/1 16:57
+     */
+    List<CompanySuperviseSettlementReportDto> queryCumulativeAccountsReceivable(@Param("systemCode") String systemCode);
 }

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -290,7 +290,7 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      * @author lipf
      * @date 2026/4/30 14:48
      */
-    List<CompanySuperviseSettlementReportDto> companySuperviseSettlementReport(SettlementReportQueryVo settlementReportQueryVo);
+    HttpResult<List<CompanySuperviseSettlementReportDto>> companySuperviseSettlementReport(SettlementReportQueryVo settlementReportQueryVo);
 
     /**
      * 对接人结算报表

+ 23 - 1
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -168,7 +168,8 @@
         io.signing_time,
         ifa.audit_status,
         io.docking_person as contact_person,
-        io.docking_person_phone as contact_person_phone
+        io.docking_person_phone as contact_person_phone,
+        pa.system_code
         FROM
         ins_orders io
         LEFT JOIN ins_orders_policy iop ON io.id = iop.order_no
@@ -1527,6 +1528,27 @@
             resultType="com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceSettlement">
         select * from ins_ply_income_invoice_settlement ipiis where ipiis.invoice_id = #{invoiceId}
     </select>
+    <select id="queryCumulativeAccountsReceivable"
+            resultType="com.jzg.commons.entity.finance.dto.CompanySuperviseSettlementReportDto">
+        select
+        eic.parent_id,
+        ipi.company_id,
+        ipi.system_code,
+        COALESCE ( SUM( ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium ),
+        0 ) AS total_receivable,
+        COALESCE ( SUM( ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium ),
+        0 ) AS total_follow_fee
+        from
+        ins_ply_income ipi
+        left join  esm_ins_company eic
+        on eic.id = ipi.company_id
+        group by
+        eic.parent_id,
+        ipi.company_id,
+        ipi.system_code
+        having company_id is not null
+        and ipi.system_code = #{systemCode}
+    </select>
 
     <!--    <select id="getReceivableList" resultType="com.jzg.commons.entity.finance.po.InsPlyIncome">-->
 <!--        SELECT-->