From 661d3c6bd42733aeb0ca83aee72f6b83bef4de36 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 18 三月 2026 16:30:56 +0800
Subject: [PATCH] fix(sales): 修复导出合同文件名编码及空指针问题
---
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index 7e28e93..aa2abf2 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -1,9 +1,21 @@
package com.ruoyi.sales.service;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
+import com.ruoyi.common.enums.SaleEnum;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.sales.dto.LossProductModelDto;
+import com.ruoyi.sales.dto.MonthlyAmountDto;
+import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
/**
* 閿�鍞彴璐ervice鎺ュ彛
@@ -13,13 +25,37 @@
*/
public interface ISalesLedgerService extends IService<SalesLedger> {
- List<SalesLedger> selectSalesLedgerList(SalesLedger salesLedger);
-
- SalesLedger selectSalesLedgerById(Long id);
+ List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto);
int deleteSalesLedgerByIds(Long[] ids);
- int insertSalesLedger(SalesLedger salesLedger);
+ int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto);
- int updateSalesLedger(SalesLedger salesLedger);
+ List<SalesLedgerProduct> getSalesLedgerProductListByRelateId(@NotNull Long relateId,@NotNull SaleEnum type);
+
+ void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type);
+
+ SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto);
+
+ List getSalesNo();
+
+ BigDecimal getContractAmount();
+
+ List getTopFiveList();
+
+ List<MonthlyAmountDto> getAmountHalfYear(Integer type);
+
+ IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto);
+
+ AjaxResult importData(MultipartFile file);
+
+ List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);
+
+ IPage<SalesLedgerDto> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page);
+
+ /**
+ * 瀵煎嚭鍔犲伐鎵挎徑鍚堝悓
+ * @param id
+ */
+ void exportProcessContract(@NotNull Long id);
}
--
Gitblit v1.9.3