fix20230113

apps/inves_manage/project_manager.py

@@ -323,6 +323,10 @@ def upload_project_data2():
             set_project_status = row_content[17]  # 项目立项状态
             set_project_status = row_content[17]  # 项目立项状态
             project_progress = row_content[18]  # 项目进展
             project_progress = row_content[18]  # 项目进展
             sign_time = row_content[19]  # 签约时间
             sign_time = row_content[19]  # 签约时间
+            project_year = ''
+            if sign_time:
+                project_year = int(sign_time.splite('/')[0])
+
             start_time = row_content[20]  # 开工时间
             start_time = row_content[20]  # 开工时间
             end_time = row_content[21]  # 竣工时间
             end_time = row_content[21]  # 竣工时间
             is_fixed_investment = row_content[22]  # 固定资产投资项目
             is_fixed_investment = row_content[22]  # 固定资产投资项目
@@ -361,7 +365,7 @@ def upload_project_data2():
         }
         }
         time_strf = datetime.now().strftime("%Y")
         time_strf = datetime.now().strftime("%Y")
         project_num_li = ''
         project_num_li = ''
-        project_obj_list = ProjectManagement.query.all()
+        project_obj_list = ProjectManagement.query.filter_by(is_delete=0).all()
         if project_obj_list:
         if project_obj_list:
             project_num_li = [project_obj.project_num for project_obj in project_obj_list if
             project_num_li = [project_obj.project_num for project_obj in project_obj_list if
                               project_obj.project_num.startswith(time_strf + prefix_dic[district])]
                               project_obj.project_num.startswith(time_strf + prefix_dic[district])]
@@ -405,6 +409,7 @@ def upload_project_data2():
                 set_project_status=set_project_status,
                 set_project_status=set_project_status,
                 project_progress=project_progress,
                 project_progress=project_progress,
                 sign_time=sign_time,
                 sign_time=sign_time,
+                project_year=project_year,
                 start_time=start_time,
                 start_time=start_time,
                 end_time=end_time,
                 end_time=end_time,
                 is_fixed_investment=is_fixed_investment,
                 is_fixed_investment=is_fixed_investment,
@@ -621,6 +626,10 @@ def project_edit():
     project_unity = request.form['project_unity']
     project_unity = request.form['project_unity']
     is_development_project = request.form['is_development_project']
     is_development_project = request.form['is_development_project']
     sign_time = request.form['sign_time']
     sign_time = request.form['sign_time']
+    project_year = ''
+    if sign_time:
+        project_year = int(sign_time.splite('/')[0])
+
     start_time = request.form['start_time']
     start_time = request.form['start_time']
     end_time = request.form['end_time']
     end_time = request.form['end_time']
     investor_rank = request.form['investor_rank']
     investor_rank = request.form['investor_rank']
@@ -687,12 +696,12 @@ def project_edit():
         project_obj.project_problem = project_problem
         project_obj.project_problem = project_problem
         project_obj.upload_unity = upload_unity
         project_obj.upload_unity = upload_unity
         project_obj.upload_people = upload_people
         project_obj.upload_people = upload_people
-        # project_obj.upload_time = upload_time
         project_obj.project_num = project_num
         project_obj.project_num = project_num
         project_obj.project_source = project_source
         project_obj.project_source = project_source
         project_obj.project_unity = project_unity
         project_obj.project_unity = project_unity
         project_obj.is_development_project = is_development_project
         project_obj.is_development_project = is_development_project
         project_obj.sign_time = sign_time
         project_obj.sign_time = sign_time
+        project_obj.project_year = project_year
         project_obj.start_time = start_time
         project_obj.start_time = start_time
         project_obj.end_time = end_time
         project_obj.end_time = end_time
         project_obj.investor_rank = investor_rank
         project_obj.investor_rank = investor_rank

apps/inves_manage/siku_view.py

@@ -289,7 +289,7 @@ def update_sign_project(upload_people, row_content):
 
 
 
 
 # 更新开工库
 # 更新开工库
-def update_star_project(upload_people, row_content):
+def update_start_project(upload_people, row_content):
     try:
     try:
         project_num = row_content[0]  # 项目编号
         project_num = row_content[0]  # 项目编号
         project_name = row_content[1]  # 项目名称
         project_name = row_content[1]  # 项目名称
@@ -840,7 +840,6 @@ def upload_project_data1():
                 return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i))
                 return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i))
             else:
             else:
                 pass
                 pass
-
     if int(data_type) == 3:  # 更新签约库
     if int(data_type) == 3:  # 更新签约库
         row_list = [table.row_values(i) for i in range(1, nrows)]
         row_list = [table.row_values(i) for i in range(1, nrows)]
         rows = len(row_list)
         rows = len(row_list)
@@ -869,7 +868,7 @@ def upload_project_data1():
                 return jsonify(code=RET.NODATA,
                 return jsonify(code=RET.NODATA,
                                msg="表格内无有效数据！")
                                msg="表格内无有效数据！")
 
 
-            ret = update_star_project(row_content)
+            ret = update_start_project(upload_people, row_content)
             if ret == 'continue':
             if ret == 'continue':
                 update_num += 1
                 update_num += 1
                 continue
                 continue