zss
2025-03-05 578bfcb3f58c5458d2c60fe37c3e56ebcda98e18
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
@@ -87,25 +87,6 @@
        String endDate = processMethodSearchNew.getEndDate();
        processMethodSearchNew.setBeginDate(null);
        processMethodSearchNew.setEndDate(null);
        // 判断日期是否为今年,如果是今年则处理为今年的数据
        try {
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            LocalDateTime startDateTime = LocalDateTime.parse(beginDate, formatter);
            LocalDateTime endDateTime = LocalDateTime.parse(endDate, formatter);
            int currentYear = LocalDateTime.now().getYear();
            // 判断传入的日期是否是今年的日期范围
            if (startDateTime.getYear() == currentYear && endDateTime.getYear() == currentYear) {
                // 传入的是今年的数据,直接返回当前的 beginDate 和 endDate
                beginDate = startDateTime.toString();
                endDate = endDateTime.toString();
            } else {
                beginDate = null;
                endDate = null;
            }
        } catch (Exception e) {
            beginDate = null;
            endDate = null;
        }
        return baseMapper.pageMethodSearchNew(page, QueryWrappers.queryWrappers(processMethodSearchNew), beginDate, endDate);
    }