修改:根据任务的开始时间与当下时间判断任务的状态

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -280,6 +280,15 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         Task task = taskMapper.selectById(taskDto.getId());
         updateTaskRepeatConfigure(task);//将任务中之前的关于重复日期相关的置空
         taskMapper.updateRepeatConfig(task);
+        //根据任务的开始时间与当下时间判断任务的状态
+        if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isAfter(LocalDateTime.now())){
+            task.setStatus(0);
+        }else if (taskDto.getEndDate()!=null&&taskDto.getEndDate().isBefore(LocalDateTime.now())){
+            task.setStatus(3);
+        } else if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isBefore(LocalDateTime.now())&&taskDto.getEndDate()!=null&&taskDto.getEndDate().isAfter(LocalDateTime.now()))
+        {
+            task.setStatus(1);
+        }
         BeanUtils.copyProperties(taskDto,task);
         taskMapper.updateById(task);
 
@@ -1187,7 +1196,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
     public void updateTaskRepeatConfigure(Task task){
         task.setRepeatType(null).setRepeatEndNever(null).setRepeatEndCount(null)
-                .setRepeatEndDate(null).setRepeatDesignDay(null).setRepeatDesignSameday(null);
+                .setRepeatEndDate(null).setRepeatDesignDay(null).setRepeatDesignSameday(null)
+                .setCustomId(null).setBusinessOpportunityId(null).setOrderId(null).setClueId(null).setContactsId(null);
     }
 
 

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -271,7 +271,8 @@
         update task
         <set>
             repeat_type=#{repeatType},repeat_end_never=#{repeatEndNever},repeat_end_count=#{repeatEndCount},
-            repeat_end_date=#{repeatEndDate},repeat_design_day=#{repeatDesignDay},repeat_design_sameday=#{repeatDesignSameday}
+            repeat_end_date=#{repeatEndDate},repeat_design_day=#{repeatDesignDay},repeat_design_sameday=#{repeatDesignSameday},
+            custom_id=#{customId},business_opportunity_id=#{businessOpportunityId},order_id=#{orderId},clue_id=#{clueId},contacts_id=#{contactsId}
         </set>
         where id=#{id}
     </update>