maven
7 天以前 5b98825dbf9d72e41660c19dbec6d556eb6a86f5
yys  修改质量模块
已修改3个文件
11 ■■■■ 文件已修改
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/sales/SalesLedgerMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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());
        }
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;
    }
}
src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -82,5 +82,6 @@
                AND  T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        order by entry_date desc
    </select>
</mapper>