fix20221126

apps/inves_manage/project_manager.py

@@ -139,7 +139,7 @@ def check_project_detail1():
                  "attract_name": project_obj.attract_name,  # 引资方名称
                  "investor_name": project_obj.investor_name,  # 投资方名称(万元)
                  "investor_district": project_obj.investor_district,  # 投资方所在地(亩)
-                 "industry": project_obj.industry,  # 所属行业
+                 "industry": project_obj.industry + project_obj.industry2,  # 所属行业
                  "investment_volume": project_obj.investment_volume,  # 总投资额(万元)
                  "construction_content": project_obj.construction_content,  # 建设内容
                  "project_address": project_obj.project_address,  # 项目选址
@@ -310,7 +310,8 @@ def upload_project_data2():
                 provence=provence,
                 city=city,
                 investor_district=provence + "/" + city,
-                industry=industry1 + '/' + industry2,
+                industry=industry1,
+                industry2=industry2,
                 investment_volume=country + provence + city,
                 construction_content=construction_content,
                 construction_nature=construction_nature,
@@ -395,8 +396,8 @@ def batch_export_project5():
             data_list.append(city)
             industry = project_obj.industry
             data_list.append(industry)
-            # industry2 = project_obj.industry2
-            # data_list.append(industry2)
+            industry2 = project_obj.industry2
+            data_list.append(industry2)
             investment_volume = project_obj.investment_volume
             data_list.append(investment_volume)
             construction_content = project_obj.construction_content
@@ -439,7 +440,7 @@ def batch_export_project5():
         sheet_name_titles = {
             "sheet1": ["项目编号", "项目名称", "项目所在地", "所属开发区", "引资方名称", "投资方名称",
                        "国别（地区）", "省（自治区、直辖市、特别行政区）",
-                       "市（州、盟、区）", "所属行业", "总投资额（万元）", "项目建设内容", "项目建设性质",
+                       "市（州、盟、区）", "一级行业（下拉框筛选）", "二级子行业（下拉框筛选）", "总投资额（万元）", "项目建设内容", "项目建设性质",
                        "项目选址详情", "用地情况（亩）", "其中新增用地（亩）", "项目立项情况", "项目进展", "签约时间",
                        "开工时间", "竣工时间", "固资产投资项目（是、否）", "资金到位本年累计（万元）",
                        "资金到位历史累计（万元）", "项目跟踪", "项目跟踪说明",

apps/models.py

@@ -1181,7 +1181,8 @@ class ProjectManagement(db.Model):
     attract_name = db.Column(db.String(30), comment='引资方名称')
     investor_name = db.Column(db.String(30), comment='投资方名称')
     investor_district = db.Column(db.String(30), comment='投资方所在地')
-    industry = db.Column(db.String(20), comment='所属行业')
+    industry = db.Column(db.String(20), comment='所属行业-一级产业')
+    industry2 = db.Column(db.String(20), comment='所属行业-二级产业')
     investment_volume = db.Column(db.Float, comment='总投资额(万元)')
     construction_content = db.Column(db.String(30), comment='建设内容')
     project_address = db.Column(db.String(20), comment='项目选址')