fix20221202

apps/inves_manage/project_manager.py

@@ -79,7 +79,8 @@ def search_project1():
                  ProjectManagement.investment_volume >= investment_volume[0] if investment_volume else text(''),
                  ProjectManagement.investment_volume < investment_volume[1] if investment_volume else text(''),
                  ProjectManagement.investor_district.like('%{}%'.format(investor_district)) if investor_district else text(''),
-                 ProjectManagement.industry == industry if industry else text(''),
+                 ProjectManagement.industry.like('%{}%'.format(industry)) if industry else text(''),
+                 ProjectManagement.industry2.like('%{}%'.format(industry)) if industry else text(''),
                  ProjectManagement.investor_name == 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(''),

apps/inves_manage/siku_view.py

@@ -468,8 +468,8 @@ def search_project():
             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.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.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(''),
             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(''),