From 4fcf61c9d1e0de1d09e11a290a5e73275619f028 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 30 一月 2026 14:39:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 76ac503..6399b32 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -43,11 +43,23 @@
@Override
public IPage<SalesLedgerProductionAccountingDto> pageProductionAccounting(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
// TODO 绠＄悊鍛樻煡璇㈡墍鏈夛紝鍏朵粬浜哄彧鑳芥煡鑷繁
+ if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
+ salesLedgerProductionAccountingDto.setEntryDate(null);
+ }else {
+ salesLedgerProductionAccountingDto.setEntryDateStart(null);
+ salesLedgerProductionAccountingDto.setEntryDateEnd(null);
+ }
return salesLedgerProductionAccountingMapper.pageProductionAccounting(page, salesLedgerProductionAccountingDto);
}
@Override
public IPage<ProductionProductMainDto> listProductionDetails(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
+ if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
+ salesLedgerProductionAccountingDto.setEntryDate(null);
+ }else {
+ salesLedgerProductionAccountingDto.setEntryDateStart(null);
+ salesLedgerProductionAccountingDto.setEntryDateEnd(null);
+ }
return productionProductMainMapper.listProductionDetails(salesLedgerProductionAccountingDto, page);
}
--
Gitblit v1.9.3