fix20221202

apps/inves_manage/siku_view.py

@@ -428,6 +428,7 @@ def search_project():
     investment_volume = req_dic['investment_volume']  # 总投资额(万元)
     project_year = req_dic['project_year']  # 项目年份
     thread_progress = req_dic['thread_progress']  # 线索进展
+
     # 线索库高级筛选
     distribute_condition_list = req_dic['distribute_condition_list']  # 分发情况（列表形式）
     project_type_list = req_dic['project_type_list']  # 项目类型（列表形式）
@@ -464,11 +465,14 @@ def search_project():
         project_obj = SikuProject.query.filter(
             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.distribute_condition.in_(distribute_condition_list) if distribute_condition_list else SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
+            # SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
+            # SikuProject.distribute_condition.in_(distribute_condition_list) if distribute_condition_list else text(''),
+
             SikuProject.project_name == project_name if project_name else text(''),
             SikuProject.investor_name == investor_name if investor_name else text(''),
             SikuProject.investor_district == investor_district if investor_district else text(''),
-            SikuProject.project_type._in(project_type_list) if project_type_list else SikuProject.project_type == project_type if project_type else text(''),
+            SikuProject.project_type.in_(project_type_list) if project_type_list else SikuProject.project_type == project_type if project_type else text(''),
             SikuProject.investment_volume >= float(investment_volume_list[0]) if investment_volume_list else text(''),
             SikuProject.investment_volume <= float(investment_volume_list[1]) if investment_volume_list else text(''),
             SikuProject.investment_volume >= float(investment_volume[0]) if investment_volume and not investment_volume_list else text(''),
@@ -476,16 +480,16 @@ def search_project():
             SikuProject.project_year >= project_year_list[0] if project_year_list else text(''),
             SikuProject.project_year <= project_year_list[1] if project_year_list else text(''),
             SikuProject.project_year == project_year if project_year and not project_year_list else text(''),
-            SikuProject.thread_progress._in(thread_progress_list) if thread_progress_list else SikuProject.thread_progress == thread_progress if thread_progress else text(''),
+            SikuProject.thread_progress.in_(thread_progress_list) if thread_progress_list else SikuProject.thread_progress == thread_progress if thread_progress else text(''),
 
             # 对接库
-            SikuProject.project_to_area._in(
+            SikuProject.project_to_area.in_(
                 project_to_area_list) if project_to_area_list else SikuProject.project_to_area == project_to_area if project_to_area else text(''),
-            SikuProject.development_area._in(
+            SikuProject.development_area.in_(
                 development_area_list) if development_area_list else SikuProject.development_area == development_area if development_area else text(''),
 
             # 签约库
-            SikuProject.project_to_area1._in(
+            SikuProject.project_to_area1.in_(
                 project_to_area1_list) if project_to_area1_list else SikuProject.project_to_area1 == project_to_area1 if project_to_area1 else text(''),
             SikuProject.sign_year > sign_year_list[0] if sign_year_list else text(''),
             SikuProject.sign_year < sign_year_list[1] if sign_year_list else text(''),