From c05ddf57634572b43869e00d426efe05d2df5077 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 10 六月 2026 08:16:23 +0800
Subject: [PATCH] feat:模版合同加备注、水电房屋租赁执行次数改为合同有效期、合同履约列表新增双方履约、开票新增拟开票数量

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
index e095ba2..9ec6689 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
 import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
 import com.by4cloud.platformx.business.entity.Contract;
 import com.by4cloud.platformx.business.vo.*;
@@ -54,4 +55,11 @@
 																		 @Param("tfCompId") Long tfgs,@Param("ymjCompId") Long ymj);
 
 	List<ContractAmountAnalysisCompVo> contractAmountAnalysisByComp(@Param("queryDTO")AnalysisCommonDTO commonDTO,@Param("compId") Long compId);
+
+	List<ContractIncomeAnalysisAreaVo> contractAmountAnalysisBySaleModel(@Param("queryDTO")AnalysisCommonDTO commonDTO
+			,@Param("compIds")List<Long> compIds,@Param("smjCompId") Long smj,
+																		 @Param("sgbCompId")Long sgb, @Param("jxcCompId")Long jxc,
+																		 @Param("tfCompId") Long tfgs,@Param("ymjCompId") Long ymj);
+
+    Page<ContractPageVo> pageScope(Page page,@Param("queryDTO") ContracQueryDTO queryDTO, DataScope comp_id);
 }

--
Gitblit v1.9.1