From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
index 855acfd..591f9c0 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
+++ b/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);
}
--
Gitblit v1.9.3