| 
															
																@ -285,8 +285,10 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                taskPatientDetailDao.save(taskPatientDetailDO); 
															 | 
															
															 | 
															
																                taskPatientDetailDao.save(taskPatientDetailDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            } 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            ActivityRuleDO ruleDO = activityRuleDao.selectByActivityId(ids.get(i)); 
															 | 
															
															 | 
															
																            ActivityRuleDO ruleDO = activityRuleDao.selectByActivityId(ids.get(i)); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            ruleDO.setDelFlag(0); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            activityRuleDao.save(ruleDO); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            if(null!=ruleDO){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                ruleDO.setDelFlag(0); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                activityRuleDao.save(ruleDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            ActivityDO activityDO = activityDao.findOne(ids.get(i)); 
															 | 
															
															 | 
															
																            ActivityDO activityDO = activityDao.findOne(ids.get(i)); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            activityDO.setStatus(-1); 
															 | 
															
															 | 
															
																            activityDO.setStatus(-1); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            activityDO.setCreateTime(new Date()); 
															 | 
															
															 | 
															
																            activityDO.setCreateTime(new Date()); 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -297,6 +299,42 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        return envelop; 
															 | 
															
															 | 
															
																        return envelop; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    } 
															 | 
															
															 | 
															
																    } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																    /** 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																     * 删除活动 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																     * 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																     * @param id 活动id 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																     * @return 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																     */ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																    public MixEnvelop<Boolean, Boolean> daleteActivity(String id){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        MixEnvelop<Boolean, Boolean> envelop = new MixEnvelop<>(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            List<TaskDO> taskDOList = taskDao.selectByActivityId(id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            for (TaskDO taskDO:taskDOList){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskDO.setStatus(0); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskDO.setCreateTime(new Date()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskDO.setUpdateTime(new Date()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskDao.save(taskDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            List<TaskPatientDetailDO> taskPatientDetailDOS = taskPatientDetailDao.selectByActivityId(id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            for(TaskPatientDetailDO taskPatientDetailDO:taskPatientDetailDOS){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskPatientDetailDO.setStatus(-1); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskPatientDetailDO.setCreateTime(new Date()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskPatientDetailDO.setUpdateTime(new Date()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                taskPatientDetailDao.save(taskPatientDetailDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            ActivityRuleDO ruleDO = activityRuleDao.selectByActivityId(id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            if(null!=ruleDO){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                ruleDO.setDelFlag(0); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                activityRuleDao.save(ruleDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            ActivityDO activityDO = activityDao.findOne(id); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            activityDO.setStatus(-1); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            activityDO.setCreateTime(new Date()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            activityDO.setUpdateTime(new Date()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            activityDO.setDelFlag(0); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            activityDao.save(activityDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        return envelop; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																    } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    /** 
															 | 
															
															 | 
															
																    /** 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     * 编辑活动:上、下线,推荐 
															 | 
															
															 | 
															
																     * 编辑活动:上、下线,推荐 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     * @param id 
															 | 
															
															 | 
															
																     * @param id 
															 |