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);