From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 30 九月 2026 16:12:49 +0800
Subject: [PATCH] feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java | 70 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 1 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 ab2b09d..8950d86 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
@@ -1,13 +1,20 @@
package com.by4cloud.platformx.business.mapper;
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.ContractQueryDTO;
import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
import com.by4cloud.platformx.business.entity.Contract;
-import com.by4cloud.platformx.business.vo.ContractCreditSalesPageVo;
+import com.by4cloud.platformx.business.vo.*;
+import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @author 28254
@@ -15,4 +22,65 @@
@Mapper
public interface ContractMapper extends PlatformxBaseMapper<Contract> {
Page<ContractCreditSalesPageVo> pageByCredit(Page page, @Param("queryDTO") CreditSalesQueryDTO queryDTO, DataScope comp_id);
+
+ List<ContractAmountAnalysisVo> contractAmountAnalysis(@Param("queryDTO")AnalysisCommonDTO commonDTO,@Param("compIds")List<Long> compIds);
+
+ List<ContractIncomeAnalysisVo> contractIncomeAnalysis(@Param("queryDTO")AnalysisCommonDTO commonDTO,@Param("compIds")List<Long> compIds);
+
+ void setSession();
+
+ List<ContractIncomeAnalysisCompVo> contractIncomeAnalysisByComp(@Param("queryDTO")AnalysisCommonDTO commonDTO,@Param("compId") Long compId);
+
+ List<ContractIncomeAnalysisAreaVo> contractAmountAnalysisByArea(@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);
+
+ List<ContractIncomeAnalysisAreaVo> contractAmountAnalysisByIndustry(@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);
+
+ List<ContractIncomeAnalysisAreaVo> contractAmountAnalysisByMarket(@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);
+
+ List<ContractIncomeAnalysisAreaVo> contractAmountAnalysisBySpcBus(@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);
+
+
+ List<ContractIncomeAnalysisAreaVo> contractAmountAnalysisByExportBus(@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);
+
+ 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);
+
+ HomeZbjtVo homeZbjt();
+
+ HomeZgsVo homeZgs(@Param("compId") Long compId);
+
+ Page<FourAssociationPageVo> fourAssociation(Page page,@Param("queryDTO") ContractQueryDTO queryDTO, DataScope comp_id);
+
+ @Select("SELECT\n" +
+ "\tbc.province \n" +
+ "FROM\n" +
+ "\tcontract c\n" +
+ "\tLEFT JOIN business_customer bc ON bc.id = c.party_a_id \n" +
+ "WHERE\n" +
+ "\tbc.province IS NOT NULL \n" +
+ "and c.party_b_id = #{compId}" +
+ "GROUP BY\n" +
+ "\tbc.province;")
+ List<String> homeZgsColum(@Param("compId") Long compId);
}
--
Gitblit v1.9.1