From f752dd141b632d2f7243c2fd750f0b54ff19dba6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 17:54:15 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 136 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 128 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 43db757..fe79f8a 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,6 +1,8 @@
package com.ruoyi.sales.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -8,10 +10,15 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.production.mapper.SalesLedgerWorkMapper;
+import com.ruoyi.production.pojo.SalesLedgerWork;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
-import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.AllArgsConstructor;
@@ -21,7 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -41,6 +48,18 @@
@Autowired
private InvoiceLedgerMapper invoiceLedgerMapper;
+
+ @Autowired
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
+
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ @Autowired
+ private SalesLedgerWorkMapper salesLedgerWorkMapper;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
@@ -66,6 +85,7 @@
}
}
}
+
return getDataTable(list);
}
@@ -86,6 +106,20 @@
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
+ }
+
+ /**
+ * 瀵煎嚭寮�绁ㄧ櫥璁板垪琛�
+ */
+ @Log(title = "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
+ Page page = new Page();
+ page.setCurrent(-1);
+ page.setSize(-1);
+ IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
+ ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
+ util.exportExcel(response, salesLedgerIPage == null ? new ArrayList<>() : salesLedgerIPage.getRecords(), "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
}
/**
@@ -158,8 +192,8 @@
* 杩戝崐骞村紑绁�,鍥炴閲戦
*/
@GetMapping("/getAmountHalfYear")
- public AjaxResult getAmountHalfYear() {
- return AjaxResult.success(salesLedgerService.getAmountHalfYear());
+ public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+ return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
}
/**
@@ -174,17 +208,103 @@
}
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));
+ List<InvoiceLedger> invoiceLedgers = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(invoiceRegistrationProducts)){
+ 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())));
+ }
+ // 鑾峰彇閿�鍞骇鍝佹暟閲�
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper
+ .selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getType, 1)
+ .in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds));
+ Map<Long, BigDecimal> salesLedgerProductCountMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(salesLedgerProducts)) {
+ salesLedgerProductCountMap = salesLedgerProducts
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.groupingBy(
+ SalesLedgerProduct::getSalesLedgerId,
+ Collectors.reducing(
+ BigDecimal.ZERO,
+ SalesLedgerProduct::getQuantity,
+ BigDecimal::add
+ )
+ ));
+ }
+ // 鑾峰彇閿�鍞骇鍝佺敓浜ф姤宸ユ暟閲�
+ List<SalesLedgerWork> salesLedgerWorks = salesLedgerWorkMapper.selectList(new LambdaQueryWrapper<SalesLedgerWork>()
+ .in(SalesLedgerWork::getSalesLedgerId, salesLedgerIds));
+ Map<Long, BigDecimal> salesLedgerWorkCountMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(salesLedgerWorks)) {
+ salesLedgerWorkCountMap = salesLedgerWorks
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.groupingBy(
+ SalesLedgerWork::getSalesLedgerId,
+ Collectors.reducing(
+ BigDecimal.ZERO,
+ SalesLedgerWork::getFinishedNum,
+ BigDecimal::add
+ )
+ ));
}
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()) {
- BigDecimal noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
- salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
+ 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;
}
}
+ if(existFlag){
+ salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
+ }else {
+ salesLedger.setNoInvoiceAmountTotal(salesLedger.getContractAmount());
+ }
+ salesLedger.setInvoiceTotal(invoiceTotal);
+ // 鍒ゆ柇鏄惁鏄敓浜у畬鎴�
+ salesLedger.setProductionStatus(salesLedgerProductCountMap.get(salesLedger.getId()) == null ? "鏈紑濮�" : salesLedgerProductCountMap.get(salesLedger.getId()).compareTo(salesLedgerWorkCountMap.get(salesLedger.getId())) > 0 ? "鐢熶骇涓�" : "宸插畬鎴�");
}
+ if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
+ if (salesLedgerDto.getStatus()) {
+ iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
+ iPage.setTotal(iPage.getRecords().size());
+ }
+ }
+
return iPage;
}
}
--
Gitblit v1.9.3