fix20221202

apps/inves_manage/project_manager.py

@@ -132,7 +132,7 @@ def check_project_detail1():
     try:
         project_obj = ProjectManagement.query.filter_by(id=project_id, is_delete=0).first()
         if project_obj.industry and project_obj.industry2:
-            industry = project_obj.industry + '-' + project_obj.industry2
+            industry = project_obj.industry + '/' + project_obj.industry2
         if project_obj.industry and not project_obj.industry2:
             industry = project_obj.industry
         project_data = {"id": project_obj.id,
@@ -599,8 +599,8 @@ def project_edit():
         current_app.logger.error(e)
         return jsonify(code=RET.SESSIONERR, msg="进行编辑项目信息操作时用户信息校验失败，请重新登陆后尝试！")
 
-    if '-' in industry:
-        industry = industry.split('-')
+    if '/' in industry:
+        industry = industry.split('/')
         industry1 = industry[0]
         industry2 = industry[1]
     else:

apps/inves_manage/siku_view.py

@@ -466,19 +466,10 @@ 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.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.industry.in_(
-            #     industry_list) if industry_list else SikuProject.industry == industry if industry else text(
-            #     ''),
-            # SikuProject.industry2.in_(
-            #     industry2_list) if industry2_list else SikuProject.industry2 == industry2 if industry2 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(''),
@@ -619,9 +610,9 @@ def add_project():
         investor_district1 = investor_district
         investor_district2 = ''
     project_type = req_dic['project_type']
-    if '-' in project_type:
-        project_type1 = project_type.split('-')[0]
-        project_type2 = project_type.split('-')[1]
+    if '/' in project_type:
+        project_type1 = project_type.split('/')[0]
+        project_type2 = project_type.split('/')[1]
     else:
         project_type1 = project_type
         project_type2 = ''
@@ -1060,9 +1051,9 @@ def edit_project_detail():
         investor_district1 = investor_district
         investor_district2 = ''
     project_type = req_dic['project_type']
-    if '-' in project_type:
-        project_type1 = project_type.split('-')[0]
-        project_type2 = project_type.split('-')[1]
+    if '/' in project_type:
+        project_type1 = project_type.split('/')[0]
+        project_type2 = project_type.split('/')[1]
     else:
         project_type1 = project_type
         project_type2 = ''
@@ -1517,9 +1508,9 @@ def edit_project():
     else:
         investor_district1 = investor_district
         investor_district2 = ''
-    if '-' in project_type:
-        project_type1 = project_type.split('-')[0]
-        project_type2 = project_type.split('-')[1]
+    if '/' in project_type:
+        project_type1 = project_type.split('/')[0]
+        project_type2 = project_type.split('/')[1]
     else:
         project_type1 = project_type
         project_type2 = ''