From d2038a623e02c2d7bb6b95a908832c0432adf2f0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 13:46:21 +0800
Subject: [PATCH] 增加日志
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 95 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index f006c5b..ccef1a4 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -14,10 +14,7 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
-import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ICommonFileService;
@@ -39,10 +36,7 @@
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -66,9 +60,6 @@
private InvoiceLedgerMapper invoiceLedgerMapper;
@Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
-
- @Autowired
private ReceiptPaymentMapper receiptPaymentMapper;
/**
@@ -85,6 +76,7 @@
@ApiOperation("瀵煎嚭閿�鍞彴璐︽ā鏉�")
@PostMapping("/exportTemplate")
+ @Log(title = "瀵煎嚭閿�鍞彴璐︽ā鏉�", businessType = BusinessType.EXPORT)
public void exportTemplate(HttpServletResponse response) {
// 1. 妯℃澘鏂囦欢鍦╮esources/static涓嬬殑璺緞
String templatePath = "static/閿�鍞彴璐﹀鍏ユā鏉�.xlsx";
@@ -125,6 +117,8 @@
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@GetMapping("/list")
+ @ApiOperation("鏌ヨ閿�鍞彴璐﹀垪琛�")
+ @Log(title = "鏌ヨ閿�鍞彴璐﹀垪琛�", businessType = BusinessType.OTHER)
public TableDataInfo list(Page page, SalesLedgerDto salesLedgerDto) {
startPage();
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
@@ -153,6 +147,8 @@
* 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
*/
@GetMapping("/getSalesLedgerWithProducts")
+ @ApiOperation("鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃")
+ @Log(title = "鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃", businessType = BusinessType.OTHER)
public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
}
@@ -162,6 +158,7 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
+ @ApiOperation("瀵煎嚭閿�鍞彴璐﹀垪琛�")
public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
Page page = new Page(-1,-1);
IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
@@ -179,6 +176,7 @@
*/
@Log(title = "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�", businessType = BusinessType.EXPORT)
@PostMapping("/exportOne")
+ @ApiOperation("瀵煎嚭寮�绁ㄧ櫥璁板垪琛�")
public void exportOne(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
Page page = new Page();
page.setCurrent(-1);
@@ -193,6 +191,7 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateSalesLedger")
+ @ApiOperation("鏂板淇敼閿�鍞彴璐�")
public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
}
@@ -202,6 +201,7 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
@DeleteMapping("/delLedger")
+ @ApiOperation("鍒犻櫎閿�鍞彴璐�")
public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -216,6 +216,8 @@
* @return
*/
@GetMapping("/listNoPage")
+ @ApiOperation("鏌ヨ閿�鍞彴璐︿笉鍒嗛〉")
+ @Log(title = "鏌ヨ閿�鍞彴璐︿笉鍒嗛〉", businessType = BusinessType.OTHER)
public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
return AjaxResult.success(list);
@@ -226,6 +228,7 @@
*/
@Log(title = "閿�鍞彴璐﹂檮浠跺垹闄�", businessType = BusinessType.DELETE)
@DeleteMapping("/delLedgerFile")
+ @ApiOperation("閿�鍞彴璐﹂檮浠跺垹闄�")
public AjaxResult delLedgerFile(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -237,6 +240,7 @@
* 鏈湀閿�鍞悎鍚岄噾棰�
*/
@GetMapping("/getContractAmount")
+ @ApiOperation("鏈湀閿�鍞悎鍚岄噾棰�")
public AjaxResult getContractAmount() {
try {
BigDecimal contractAmount = salesLedgerService.getContractAmount();
@@ -250,6 +254,7 @@
* 瀹㈡埛鍚堝悓閲戦TOP5缁熻
*/
@GetMapping("/getTopFiveList")
+ @ApiOperation("瀹㈡埛鍚堝悓閲戦TOP5缁熻")
public AjaxResult getTopFiveList() {
return AjaxResult.success(salesLedgerService.getTopFiveList());
}
@@ -258,6 +263,7 @@
* 杩戝崐骞村紑绁�,鍥炴閲戦
*/
@GetMapping("/getAmountHalfYear")
+ @ApiOperation("杩戝崐骞村紑绁�,鍥炴閲戦")
public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
}
@@ -266,70 +272,87 @@
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@GetMapping("/listPage")
+ @ApiOperation("鏌ヨ閿�鍞彴璐﹀垪琛�")
public IPage<SalesLedger> listPage(Page page, SalesLedgerDto salesLedgerDto) {
- IPage<SalesLedger> iPage = salesLedgerService.selectSalesLedgerListPage(page,salesLedgerDto);
- // 璁＄畻宸插紑绁ㄩ噾棰�/鏈紑绁ㄩ噾棰�(宸插～鍐欏彂绁ㄩ噾棰濅负鍑�)
- if(CollectionUtils.isEmpty(iPage.getRecords())){
- return iPage;
- }
- List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
- List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
- if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
- return iPage;
- }
- // 璁＄畻鍥炴閲戦锛屽緟鍥炴閲戦
- List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
- .in(InvoiceRegistrationProduct::getSalesLedgerId, salesLedgerIds));
+ IPage<SalesLedger> iPage = salesLedgerService.selectSalesLedgerListPage(page, salesLedgerDto);
- List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
- .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
- List<ReceiptPayment> receiptPayments = new ArrayList<>();
- if(!CollectionUtils.isEmpty(invoiceLedgers)){
- receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
- .in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList())));
+ // 鏌ヨ缁撴灉涓虹┖,鐩存帴杩斿洖
+ if (CollectionUtils.isEmpty(iPage.getRecords())) {
+ return iPage;
}
- for (SalesLedger salesLedger : iPage.getRecords()) {
- boolean existFlag = false;
- BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
- BigDecimal invoiceTotal = BigDecimal.ZERO;
- for (InvoiceLedgerDto invoiceLedgerDto : invoiceLedgerDtoList) {
- if (salesLedger.getId().intValue() == invoiceLedgerDto.getSalesLedgerId()) {
- noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
- invoiceTotal = invoiceLedgerDto.getInvoiceTotal();
- existFlag = true;
- if(!CollectionUtils.isEmpty(receiptPayments)){
- List<InvoiceRegistrationProduct> collect = invoiceRegistrationProducts.stream()
- .filter(item -> salesLedger.getId().equals(Long.parseLong(item.getSalesLedgerId().toString())))
- .collect(Collectors.toList());
- List<Integer> collect1 = collect.stream()
- .map(InvoiceRegistrationProduct::getId).collect(Collectors.toList());
- List<InvoiceLedger> collect2 = invoiceLedgers.stream()
- .filter(item -> collect1.contains(item.getInvoiceRegistrationProductId()))
- .collect(Collectors.toList());
- // 鑾峰彇宸插洖娆鹃噾棰�
- List<ReceiptPayment> collect3 = receiptPayments.stream()
- .filter(item -> collect2.stream().anyMatch(item1 -> item1.getId().equals(item.getInvoiceLedgerId())))
- .collect(Collectors.toList());
- BigDecimal receiptPaymentAmountTotal = collect3.stream().map(ReceiptPayment::getReceiptPaymentAmount)
- .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
- // 鑾峰彇寰呭洖娆鹃噾棰�
- BigDecimal noReceiptPaymentAmountTotal = invoiceLedgerDto.getInvoiceTotal().subtract(receiptPaymentAmountTotal);
- salesLedger.setReceiptPaymentAmountTotal(receiptPaymentAmountTotal);
- salesLedger.setNoReceiptAmount(noReceiptPaymentAmountTotal);
- }
- break;
+
+ // 鑾峰彇褰撳墠椤垫墍鏈夊彴璐﹁褰曠殑 ID 闆嗗悎
+ List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
+
+ // 鏌ヨ鍙戠エ淇℃伅鐨勫凡寮�绁ㄩ噾棰�
+ List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
+ if (CollectionUtils.isEmpty(invoiceLedgerDtoList)) {
+ invoiceLedgerDtoList = Collections.emptyList();
+ }
+
+ // 杞崲鍙戠エ鏁版嵁, key 涓哄彴璐D, value 涓鸿鍙拌处鐨勬�诲紑绁ㄩ噾棰�
+ Map<Long, BigDecimal> invoiceTotals = invoiceLedgerDtoList.stream()
+ .filter(dto -> dto.getSalesLedgerId() != null && dto.getInvoiceTotal() != null)
+ .collect(Collectors.toMap(
+ dto -> dto.getSalesLedgerId().longValue(),
+ InvoiceLedgerDto::getInvoiceTotal,
+ BigDecimal::add // 瀛樺湪閲嶅ID鎵ц绱姞
+ ));
+
+ // 鏌ヨ鍥炴/浠樻璁板綍
+ List<ReceiptPayment> receiptPayments = Collections.emptyList();
+ if (!CollectionUtils.isEmpty(salesLedgerIds)) {
+ receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
+ .in(ReceiptPayment::getSalesLedgerId, salesLedgerIds));
+ }
+
+ // 杞崲鍥炴鏁版嵁, key 涓哄彴璐D, value 涓鸿鍙拌处鐨勬�诲洖娆鹃噾棰�
+ Map<Long, BigDecimal> receiptTotals = new HashMap<>();
+ if (!CollectionUtils.isEmpty(receiptPayments)) {
+ for (ReceiptPayment receiptPayment : receiptPayments) {
+ if (receiptPayment.getSalesLedgerId() != null && receiptPayment.getReceiptPaymentAmount() != null) {
+ // 濡傛灉 key 瀛樺湪鍒欑浉鍔�,涓嶅瓨鍦ㄥ垯鏀惧叆
+ receiptTotals.merge(receiptPayment.getSalesLedgerId(), receiptPayment.getReceiptPaymentAmount(), BigDecimal::add);
}
}
- if(existFlag){
- salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
- }else {
- salesLedger.setNoInvoiceAmountTotal(salesLedger.getContractAmount());
- }
- salesLedger.setInvoiceTotal(invoiceTotal);
}
+
+ for (SalesLedger salesLedger : iPage.getRecords()) {
+ Long ledgerId = salesLedger.getId();
+ // 鍚堝悓鎬婚噾棰�
+ BigDecimal contractAmount = salesLedger.getContractAmount() == null ? BigDecimal.ZERO : salesLedger.getContractAmount();
+ // 寮�绁ㄦ�婚鍜屽洖娆炬�婚
+ BigDecimal invoiceTotal = invoiceTotals.getOrDefault(ledgerId, BigDecimal.ZERO);
+ BigDecimal receiptPaymentAmountTotal = receiptTotals.getOrDefault(ledgerId, BigDecimal.ZERO);
+
+ // 鏈紑绁ㄩ噾棰� = 鍚堝悓閲戦 - 宸插紑绁ㄩ噾棰�
+ BigDecimal noInvoiceAmountTotal = contractAmount.subtract(invoiceTotal);
+ if (noInvoiceAmountTotal.compareTo(BigDecimal.ZERO) < 0) {
+ noInvoiceAmountTotal = BigDecimal.ZERO;
+ }
+
+ // 寰呭洖娆鹃噾棰� = 宸插紑绁ㄩ噾棰� - 宸插洖娆鹃噾棰�
+ BigDecimal noReceiptPaymentAmountTotal = invoiceTotal.subtract(receiptPaymentAmountTotal);
+ if (noReceiptPaymentAmountTotal.compareTo(BigDecimal.ZERO) < 0) {
+ noReceiptPaymentAmountTotal = BigDecimal.ZERO;
+ }
+
+ salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
+ salesLedger.setInvoiceTotal(invoiceTotal);
+ salesLedger.setReceiptPaymentAmountTotal(receiptPaymentAmountTotal);
+ salesLedger.setNoReceiptAmount(noReceiptPaymentAmountTotal);
+
+ // 濡傛灉宸茬粡鏈夎繃寮�绁ㄦ垨鍥炴鎿嶄綔,鍒欎笉鍏佽缂栬緫
+ boolean hasInvoiceOperation = invoiceTotal.compareTo(BigDecimal.ZERO) > 0;
+ boolean hasReceiptOperation = receiptPaymentAmountTotal.compareTo(BigDecimal.ZERO) > 0;
+ salesLedger.setIsEdit(!(hasInvoiceOperation || hasReceiptOperation));
+ }
+
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
- iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
+ // 娓呴櫎鎵�鏈夆�滄湭寮�绁ㄩ噾棰濃�濅负 0 鐨勮褰�
+ iPage.getRecords().removeIf(salesLedger ->
+ Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
iPage.setTotal(iPage.getRecords().size());
}
}
@@ -342,4 +365,10 @@
public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
}
+
+ @ApiOperation("瀵煎嚭")
+ @PostMapping ("/exportSaleOutbound")
+ public void export(HttpServletResponse response, @RequestBody SalesLedger salesLedger) {
+ salesLedgerService.export(response,salesLedger.getId());
+ }
}
--
Gitblit v1.9.3