From 5b98825dbf9d72e41660c19dbec6d556eb6a86f5 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 08 十二月 2025 15:18:11 +0800
Subject: [PATCH] yys 修改质量模块
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 1 +
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 1 +
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 9 +++++++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index f29bedf..656310f 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -153,6 +153,7 @@
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId,qualityInspectDto.getId()));
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspectDto.getId());
+ qualityInspectParam.setId(null);
}
qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index c384520..e68abd9 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -261,10 +261,15 @@
}
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
- iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
+ // 鑾峰彇鍒犻櫎鏁伴噺
+ long count = iPage.getRecords()
+ .stream()
+ .filter(salesLedger -> salesLedger.getNoInvoiceAmountTotal() != null && salesLedger.getNoInvoiceAmountTotal().compareTo(BigDecimal.ZERO) == 0)
+ .count();
+ iPage.setTotal(iPage.getTotal() - count);
+ iPage.getRecords().removeIf(salesLedger -> salesLedger.getNoInvoiceAmountTotal() != null && salesLedger.getNoInvoiceAmountTotal().compareTo(BigDecimal.ZERO) == 0);
}
}
- iPage.setTotal(iPage.getRecords().size());
return iPage;
}
}
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 7ce76a8..a73b2ae 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -82,5 +82,6 @@
AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
+ order by entry_date desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3