fix20221202

apps/inves_manage/project_manager.py

@@ -57,6 +57,11 @@ def search_project1():
     investor_name = req_dic['investor_name']
     investor_name = req_dic['investor_name']
     investor_district = req_dic['investor_district']
     investor_district = req_dic['investor_district']
     industry = req_dic['industry']
     industry = req_dic['industry']
+    if '/' in industry:
+        industry1 = industry.split('/')[0]
+        industry2 = industry.split('/')[1]
+    else:
+        industry1 = industry
     investment_volume = req_dic['investment_volume']
     investment_volume = req_dic['investment_volume']
     project_progress = req_dic['project_progress']
     project_progress = req_dic['project_progress']
     project_year = req_dic['project_year']
     project_year = req_dic['project_year']
@@ -79,8 +84,8 @@ def search_project1():
                  ProjectManagement.investment_volume >= investment_volume[0] if investment_volume else text(''),
                  ProjectManagement.investment_volume >= investment_volume[0] if investment_volume else text(''),
                  ProjectManagement.investment_volume < investment_volume[1] 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.investor_district.like('%{}%'.format(investor_district)) if investor_district else text(''),
-                 ProjectManagement.industry.like('%{}%'.format(industry)) if industry else text(''),
-                 ProjectManagement.industry2.like('%{}%'.format(industry)) if industry 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 == investor_name if investor_name else text(''),
                  ProjectManagement.project_progress == project_progress if project_progress else text(''),
                  ProjectManagement.project_progress == project_progress if project_progress else text(''),
                  ProjectManagement.project_year == project_year if project_year else text(''),
                  ProjectManagement.project_year == project_year if project_year else text(''),

apps/inves_manage/siku_view.py

@@ -154,6 +154,7 @@ def update_joint_project(row_content):
             project_num=project_num).first()  # 项目编号
             project_num=project_num).first()  # 项目编号
 
 
         # 更新项目信息
         # 更新项目信息
+        project_obj.thread_progress = '对接中',
         project_obj.project_name = project_name
         project_obj.project_name = project_name
         project_obj.provence = investor_district1
         project_obj.provence = investor_district1
         project_obj.city = investor_district2
         project_obj.city = investor_district2
@@ -904,6 +905,7 @@ def distribute_project():
 
 
             if not old_distribute_condition:
             if not old_distribute_condition:
                 old_project_obj.distribute_condition = district
                 old_project_obj.distribute_condition = district
+                old_project_obj.thread_progress = '对接中'
                 old_project_obj.flag = 2
                 old_project_obj.flag = 2
                 db.session.commit()
                 db.session.commit()
                 district_list1.append(district)
                 district_list1.append(district)
@@ -1154,6 +1156,10 @@ def project_move():
             return jsonify(code=RET.PARAMERR, msg="参数错误！")
             return jsonify(code=RET.PARAMERR, msg="参数错误！")
 
 
         project_obj.flag = flag
         project_obj.flag = flag
+        if flag == 3:
+            project_obj.thread_progress = '已签约'
+        if flag == 4:
+            project_obj.thread_progress = '已开工'
         db.session.commit()
         db.session.commit()
         # 记录项目动态
         # 记录项目动态
         time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")