fix20221221

apps/inves_manage/project_manager.py

@@ -331,7 +331,7 @@ def upload_project_data2():
             project_num = time_strf + num
             project_num = time_strf + num
         else:
         else:
             project_num = time_strf + '001'
             project_num = time_strf + '001'
-
+        industry_level = ''
         if industry1 and industry2:
         if industry1 and industry2:
             industry_level = get_industry_level(industry1, industry2)
             industry_level = get_industry_level(industry1, industry2)
         if industry1 and not industry2:
         if industry1 and not industry2:
@@ -431,8 +431,8 @@ def batch_export_project5():
             data_list.append(attract_name)
             data_list.append(attract_name)
             investor_name = project_obj.investor_name
             investor_name = project_obj.investor_name
             data_list.append(investor_name)
             data_list.append(investor_name)
-            investor_district = project_obj.investor_district
-            data_list.append(investor_district)
+            # investor_district = project_obj.investor_district
+            # data_list.append(investor_district)
             country = project_obj.country
             country = project_obj.country
             data_list.append(country)
             data_list.append(country)
             provence = project_obj.provence
             provence = project_obj.provence
@@ -485,11 +485,10 @@ def batch_export_project5():
         sheet_name_titles = {
         sheet_name_titles = {
             "sheet1": ["项目编号", "项目名称", "项目所在地", "所属开发区", "引资方名称", "投资方名称",
             "sheet1": ["项目编号", "项目名称", "项目所在地", "所属开发区", "引资方名称", "投资方名称",
                        "国别（地区）", "省（自治区、直辖市、特别行政区）",
                        "国别（地区）", "省（自治区、直辖市、特别行政区）",
-                       "市（州、盟、区）", "一级行业（下拉框筛选）", "二级子行业（下拉框筛选）", "总投资额（万元）", "项目建设内容", "项目建设性质",
-                       "项目选址详情", "用地情况（亩）", "其中新增用地（亩）", "项目立项情况", "项目进展", "签约时间",
-                       "开工时间", "竣工时间", "固资产投资项目（是、否）", "资金到位本年累计（万元）",
-                       "资金到位历史累计（万元）", "项目跟踪", "项目跟踪说明",
-
+                       "市（州、盟、区）", "一级行业（下拉框筛选）", "二级子行业（下拉框筛选）", "总投资额（万元）",
+                       "项目建设内容", "项目建设性质", "项目选址详情", "用地情况（亩）", "其中新增用地（亩）",
+                       "项目立项情况", "项目进展", "签约时间", "开工时间", "竣工时间", "固资产投资项目（是、否）",
+                       "资金到位本年累计（万元）", "资金到位历史累计（万元）", "项目跟踪", "项目跟踪说明"
                        ]}
                        ]}
 
 
         excel = xlwt.Workbook(encoding='utf-8')
         excel = xlwt.Workbook(encoding='utf-8')

apps/inves_manage/siku_view.py

@@ -996,6 +996,9 @@ def distribute_project():
             )
             )
             db.session.add(new_project)
             db.session.add(new_project)
             db.session.commit()
             db.session.commit()
+            time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            write_dynamic(user_name, project_id, '分发至 {} 对接库'.format(district), time1)
+
             district_list1.append(district)
             district_list1.append(district)