From fa132afa3a6942a48002c8e36e9ee47de13ee005 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 三月 2025 18:44:45 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index fe5f22b..63b3176 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -220,7 +220,7 @@
     public void dealHisData2() {
         //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
         // 鎸囧畾鐨勫紑濮嬫棩鏈�
-        LocalDate endDate = LocalDate.of(2024, 9, 1);
+        LocalDate endDate = LocalDate.of(2025, 3, 3);
         // 褰撳墠鏃ユ湡
         LocalDate currentDate = LocalDate.now();
         // 瀹氫箟鏃ユ湡鏍煎紡
@@ -335,6 +335,14 @@
                             //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
                             break;
                         }
+                        if (org.apache.commons.lang3.StringUtils.isEmpty(serviceSubtask.getPhone())) {
+                            serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+                            serviceSubtask.setSendstate(4L);
+                            serviceSubtask.setResult("error");
+                            serviceSubtask.setFinishtime(new Date());
+                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+                            continue;
+                        }
                         boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
                         //璇存槑鏄珛鍗冲彂閫�(鍏堟妸娑堟伅鏀惧埌cache-0涓紝   displayNo涓嶇煡閬撴�庝箞閰嶇疆)
                         if (dateToday) {
@@ -404,6 +412,8 @@
                             ssvo.setCreateStartTime(startOfDayDate);
                             ssvo.setCreateEndTime(endOfDayDate);
                             ssvo.setCreateBy(serviceSubtask.getCreateBy());
+                            ssvo.setSendname(serviceSubtask.getSendname());
+                            ssvo.setSfzh(serviceSubtask.getSfzh());
                             List<ServiceSubtask> serviceSubtaskListByCreateTime = serviceSubtaskMapper.selectServiceSubtaskListByCreateTime(ssvo);
                             if (CollectionUtils.isEmpty(serviceSubtaskListByCreateTime))
                                 serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -590,7 +600,7 @@
         String filename = null;
         if (cry.equals("0")) filename = "鍏ラ櫌淇℃伅" + System.currentTimeMillis();
         if (cry.equals("1")) filename = "鍑洪櫌淇℃伅" + System.currentTimeMillis();
-        File file = new File("D:\\public\\鍗庡崜闆嗘垚骞冲彴鏁版嵁\\" + filename);
+        File file = new File("D:\\public\\HIS鏁版嵁閲囬泦\\" + filename);
         if (!file.exists()) {
             // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘柊鏂囦欢
             try {

--
Gitblit v1.9.3