From 510495e1abf3e9894ccf39e245b814d1b6f887d4 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Wed, 17 Nov 2021 17:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E4=BA=BA=E6=97=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E5=AD=97=E6=AE=B5=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/distribute/impl/DistributeServiceImpl.java | 4 ++++ .../service/receiveruser/impl/ReceiverUserServiceImpl.java | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/com/tenlion/systemtask/service/distribute/impl/DistributeServiceImpl.java b/src/main/java/cn/com/tenlion/systemtask/service/distribute/impl/DistributeServiceImpl.java index cee5dd8..9349ca7 100644 --- a/src/main/java/cn/com/tenlion/systemtask/service/distribute/impl/DistributeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/systemtask/service/distribute/impl/DistributeServiceImpl.java @@ -464,6 +464,10 @@ public class DistributeServiceImpl extends DefaultBaseService implements IDistri if(null != business) { receiverUserVO.setBusiness(business); } + receiverUserVO.setIsReceive(0); + receiverUserVO.setIsSupervision(0); + receiverUserVO.setIsWarning(0); + receiverUserVO.setCheckStatus("未审核"); receiverUserVO.setReceiveType("下派"); receiverUserVO.setTaskType("正常"); receiverUserVO.setExecuteStatus("未完成"); diff --git a/src/main/java/cn/com/tenlion/systemtask/service/receiveruser/impl/ReceiverUserServiceImpl.java b/src/main/java/cn/com/tenlion/systemtask/service/receiveruser/impl/ReceiverUserServiceImpl.java index 1234efd..92c896f 100644 --- a/src/main/java/cn/com/tenlion/systemtask/service/receiveruser/impl/ReceiverUserServiceImpl.java +++ b/src/main/java/cn/com/tenlion/systemtask/service/receiveruser/impl/ReceiverUserServiceImpl.java @@ -318,15 +318,10 @@ public class ReceiverUserServiceImpl extends DefaultBaseService implements IRece // 系统当前时间 String nowDateStr = df.format(new Date()); for(ReceiverUserDTO receiverUserDTO: receiverUserDTOList) { - // 判断当前任务是否选择了任务模板 - // 如果选择了模板：则判断任务类型 // 单次任务和多次任务根据给定的截止日期 // 循环任务根据默认时限为最后时限 // 例如：每天，则为当天24点前 // 例如：每周，则为本周周日24点前 - if(StringUtils.isEmpty(receiverUserDTO.getTaskTemplate())) { - - } String[] deadLineTime = receiverUserDTO.getDistributeDeadline().split(","); if(1 == deadLineTime.length) { setTaskType(nowDateStr, deadLineTime[0], receiverUserDTO);