fix20221202

apps/inves_manage/project_manager.py

@@ -57,6 +57,7 @@ def search_project1():
     investor_name = req_dic['investor_name']
     investor_district = req_dic['investor_district']
     industry = req_dic['industry']
+    industry2 = ''
     if '/' in industry:
         industry1 = industry.split('/')[0]
         industry2 = industry.split('/')[1]
@@ -70,6 +71,7 @@ def search_project1():
 
     try:
         user_obj = verify_token(token)
+        user_id = user_obj.id
     except Exception as e:
         current_app.logger.error(e)
         return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
@@ -78,7 +80,6 @@ def search_project1():
         project_obj = ProjectManagement.query.filter(
                  ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
                  ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),
-                 ProjectManagement.project_name == project_name if project_name else text(''),
                  ProjectManagement.district == district if district else text(''),
                  ProjectManagement.development_area == development_area if development_area else text(''),
                  ProjectManagement.investment_volume >= investment_volume[0] if investment_volume else text(''),
@@ -86,7 +87,7 @@ def search_project1():
                  ProjectManagement.investor_district.like('%{}%'.format(investor_district)) if investor_district else text(''),
                  ProjectManagement.industry.like('%{}%'.format(industry1)) if industry1 else text(''),
                  ProjectManagement.industry2.like('%{}%'.format(industry2)) if industry2 else text(''),
-                 ProjectManagement.investor_name == investor_name if investor_name else text(''),
+                 ProjectManagement.investor_name.like('%{}%'.format(investor_name)) if investor_name else text(''),
                  ProjectManagement.project_progress == project_progress if project_progress else text(''),
                  ProjectManagement.project_year == project_year if project_year else text(''),
                  ProjectManagement.is_delete == 0

apps/inves_manage/siku_view.py

@@ -467,8 +467,8 @@ def search_project():
             SikuProject.flag >= flag if flag else text(''),  # 线索库包含所有阶段的项目
             SikuProject.is_delete == 0,
             SikuProject.distribute_condition.in_(distribute_condition_list) if distribute_condition_list else SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
-            SikuProject.project_name == project_name if project_name else text(''),
-            SikuProject.investor_name == investor_name if investor_name else text(''),
+            SikuProject.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
+            SikuProject.investor_name.like('%{}%'.format(investor_name)) if investor_name else text(''),
             SikuProject.investor_district.like('%{}%'.format(investor_district)) if investor_district else text(''),
             SikuProject.project_type.in_(project_type_list) if project_type_list else SikuProject.project_type.like('%{}%'.format(project_type)) if project_type else text(''),
             SikuProject.investment_volume >= float(investment_volume_list[0]) if investment_volume_list else text(''),
@@ -538,6 +538,7 @@ def search_project():
                 "joint_person": project_obj.joint_person,  # 对接人
                 "joint_person_mobile": project_obj.joint_person_mobile,  # 对接人联系方式
                 "stop_reason": project_obj.stop_reason,  # 暂停终止原因
+                "thread_progress": project_obj.thread_progress,
             } for project_obj in project_obj_list]
 
         if flag == 3:  # 签约库