|
@@ -393,14 +393,18 @@ class NewCustomerViewSet(CustomModelViewSet):
|
|
|
next_time = (timezone.now() + datetime.timedelta(days=stage_progress.track_day)).strftime('%Y-%m-%d')
|
|
|
# 获取当前客户已有项目集合
|
|
|
new_customers= NewCustomer.objects.filter(report_customer=instance.report_customer)
|
|
|
- new_project = []
|
|
|
+ new_projects = []
|
|
|
for new_customer in new_customers:
|
|
|
- new_project.append(new_customer.project.all())
|
|
|
+ new_project = new_customer.project.all()
|
|
|
+ new_projects.append(','.join(new_project.values_list('name', flat=True)))
|
|
|
+
|
|
|
|
|
|
for project in projects:
|
|
|
# 重复项目跳出循环
|
|
|
- if project in new_project:
|
|
|
+ option = Option.objects.filter(id=project).first()
|
|
|
+ if option.name in new_projects:
|
|
|
continue
|
|
|
+
|
|
|
customer = NewCustomer.objects.create(report_customer=instance.report_customer, gender=instance.gender,
|
|
|
track_user=instance.track_user, stage_progress=stage_progress,
|
|
|
create_user=instance.create_user, store=instance.store,
|