From 62dbd8169d8cad03e7a06f9b53b0a1928caf732f Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 06 三月 2025 18:13:45 +0800 Subject: [PATCH] 代码提交 --- ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 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 4a42a20..fe5f22b 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 @@ -22,6 +22,7 @@ import com.smartor.mapper.ServiceTaskMapper; import com.smartor.mapper.SysUserImportMapper; import com.smartor.service.*; +import com.sun.org.apache.bcel.internal.generic.NEW; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -390,9 +391,22 @@ //灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3 serviceSubtask.setSendstate(3L); serviceSubtask.setId(null); + serviceSubtask.setFinishtime(null); serviceSubtask.setCreateTime(new Date()); serviceSubtask.setUpdateTime(new Date()); - serviceSubtaskMapper.insertServiceSubtask(serviceSubtask); + //澶勭悊閲嶅鏂板闂锛屽厛鏌ヤ竴涓嬩粖澶╂槸涓嶆槸鏈夋柊澧炶繃锛屾柊澧炶繃灏变笉鏂板浜� + ServiceSubtaskVO ssvo = new ServiceSubtaskVO(); + LocalDate today = LocalDate.now(); + LocalTime startOfDay = LocalTime.of(0, 0, 0); + LocalTime endOfDay = LocalTime.of(23, 59, 59); + Date startOfDayDate = Date.from(today.atTime(startOfDay).atZone(ZoneId.systemDefault()).toInstant()); + Date endOfDayDate = Date.from(today.atTime(endOfDay).atZone(ZoneId.systemDefault()).toInstant()); + ssvo.setCreateStartTime(startOfDayDate); + ssvo.setCreateEndTime(endOfDayDate); + ssvo.setCreateBy(serviceSubtask.getCreateBy()); + List<ServiceSubtask> serviceSubtaskListByCreateTime = serviceSubtaskMapper.selectServiceSubtaskListByCreateTime(ssvo); + if (CollectionUtils.isEmpty(serviceSubtaskListByCreateTime)) + serviceSubtaskMapper.insertServiceSubtask(serviceSubtask); } } } else if (descByCode.equals("鐭俊")) { @@ -415,12 +429,14 @@ continue; } String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key); + String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key); SendMagParam sendMagParam = new SendMagParam(); sendMagParam.setType("4"); ServiceOutPath serviceOutPath = new ServiceOutPath(); serviceOutPath.setParam1(taskId); serviceOutPath.setParam2(patid); serviceOutPath.setParam3(ivrTask1.getTaskName()); + serviceOutPath.setParam6(subId); serviceOutPath.setCreateTime(new Date()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); -- Gitblit v1.9.3