fix: 不合格预警设置为一个月

gongchunyi

2026-06-28 86379aae223a16fed59d46f915ade96ef987b8d2

fix: 不合格预警设置为一个月

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -2058,11 +2058,10 @@

    @Override
    public NonComplianceWarningDto nonComplianceWarning() {
        String[] range = lastSevenDaysDateRange();
        String[] range = lastMonthDateRange();
        String startStr = range[0];
        String endStr = range[1];

        // 查询近七天已处理不合格数据
        List<QualityUnqualified> list = qualityUnqualifiedMapper.selectList(
                new LambdaQueryWrapper<QualityUnqualified>()
                        .eq(QualityUnqualified::getInspectState, 1)
@@ -2126,7 +2125,6 @@

            // 组装明细
            NonComplianceWarningDto.Item child = new NonComplianceWarningDto.Item();
            // child.setProductTitle(item.getProductName());
            child.setParentProductTitle(parent.getProductName());
            child.setProductTitle(item.getProductName());
            child.setDescription(item.getDefectivePhenomena());
@@ -2146,6 +2144,14 @@
        return dto;
    }

    private String[] lastMonthDateRange() {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime startTime = now.minusMonths(1);

        return new String[]{startTime.format(formatter), now.format(formatter)};
    }

    private BigDecimal calcRate(BigDecimal part, BigDecimal total) {
        if (total == null || total.compareTo(BigDecimal.ZERO) == 0) {
            return BigDecimal.ZERO.setScale(2);