From 1ab612fa454477bfaec03b0fe9133f8881ce29cc Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 16:16:02 +0800
Subject: [PATCH] yys 回款---财务收入,付款---财务支出

---
 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
index f3d1ef1..d6cffe4 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
@@ -121,8 +121,10 @@
         BeanUtils.copyProperties(timingTaskDto, timingTask);
         // 1. 瑙f瀽瀛楃涓蹭负 LocalDate锛堝彧鍖呭惈骞存湀鏃ワ級
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate localDate = LocalDate.parse(timingTaskDto.getDateStr(), formatter);
-
+        LocalDate localDate = LocalDate.now();
+        if(StringUtils.isNotEmpty(timingTaskDto.getDateStr())){
+            localDate = LocalDate.parse(timingTaskDto.getDateStr(), formatter);
+        }
         // 2. 鑾峰彇褰撳墠绯荤粺鐨� LocalTime锛堝寘鍚椂鍒嗙锛�
         LocalTime currentTime = LocalTime.now();
 
@@ -155,7 +157,7 @@
         }
     }
 
-    private LocalDateTime calculateFirstExecutionTime(TimingTask task) {
+    public LocalDateTime calculateFirstExecutionTime(TimingTask task) {
         // 鏍规嵁棰戠巼绫诲瀷鍜岃鎯呰绠楅娆℃墽琛屾椂闂�
         String frequencyType = task.getFrequencyType();
         if ("DAILY".equals(frequencyType)) {
@@ -455,7 +457,13 @@
 
     @Override
     public int delByIds(Long[] ids) {
-        return timingTaskMapper.deleteBatchIds(Arrays.asList(ids));
+        int i = timingTaskMapper.deleteBatchIds(Arrays.asList(ids));
+        if(i > 0){
+            for (Long id : ids) {
+                timingTaskScheduler.unscheduleTimingTask(id);
+            }
+        }
+        return i;
     }
 
 }

--
Gitblit v1.9.3