fix20230201

apps/inves_manage/siku_view.py

@@ -123,7 +123,6 @@ def upload_xiansuo_project(row_content, time_strf, upload_time, upload_unity, up
         # 记录项目动态
         time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         write_dynamic(upload_people, project_id, '导入了项目', time1)
-
         return 'continue'
     except Exception as e:
         return 'error1'
@@ -132,7 +131,9 @@ def upload_xiansuo_project(row_content, time_strf, upload_time, upload_unity, up
 # 更新对接库
 def update_joint_project(upload_people, row_content):
     try:
-        project_num = row_content[0]  # 项目名称
+        project_num = row_content[0]  # 项目编号
+        if not project_num:
+            return 'error3'
         project_name = row_content[1]  # 项目名称
         investor_name = row_content[2]  # 投资方名称
         investor_district1 = row_content[3]  # 投资方所在地,省
@@ -140,7 +141,6 @@ def update_joint_project(upload_people, row_content):
 
         if investor_district2:
             if investor_district2 in ['北京市', '上海市', '天津市', '重庆市']:
-                # return jsonify(code=RET.DATAERR, msg='{} 项目，请按照表格要求填写直辖市和行政区'.format(project_name))
                 return 'error2'
             investor_district = investor_district1 + '/' + investor_district2
         else:
@@ -212,6 +212,8 @@ def update_joint_project(upload_people, row_content):
 def update_sign_project(upload_people, row_content):
     try:
         project_num = row_content[0]  # 项目编号
+        if not project_num:
+            return 'error3'
         project_name = row_content[1]  # 项目名称
         attract_name = row_content[2]  # 引资方名称
         investor_name = row_content[3]  # 投资方名称
@@ -306,6 +308,8 @@ def update_sign_project(upload_people, row_content):
 def update_start_project(upload_people, row_content):
     try:
         project_num = row_content[0]  # 项目编号
+        if not project_num:
+            return 'error3'
         project_name = row_content[1]  # 项目名称
         attract_name = row_content[2]  # 引资方名称
         investor_name = row_content[3]  # 投资方名称
@@ -837,9 +841,9 @@ def upload_project_data1():
             elif ret == 'error':
                 return jsonify(code=RET.DATAERR, msg='编号超出三位的规定范围，请联系管理员！')
             elif ret == 'error1':
-                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！'.format(i + 1))
             elif ret == 'error2':
-                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i + 1))
             else:
                 pass
     if int(data_type) == 2:  # 更新对接库
@@ -857,9 +861,11 @@ def upload_project_data1():
                 update_num += 1
                 continue
             elif ret == 'error1':
-                return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i + 1))
             elif ret == 'error2':
-                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i + 1))
+            elif ret == 'error3':
+                return jsonify(code=RET.DATAERR, msg='项目编号不能为空！')
             else:
                 pass
     if int(data_type) == 3:  # 更新签约库
@@ -877,9 +883,11 @@ def upload_project_data1():
                 update_num += 1
                 continue
             elif ret == 'error1':
-                return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i + 1))
             elif ret == 'error2':
-                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i + 1))
+            elif ret == 'error3':
+                return jsonify(code=RET.DATAERR, msg='项目编号不能为空！')
             else:
                 pass
     if int(data_type) == 4:  # 更新开工库
@@ -897,9 +905,11 @@ def upload_project_data1():
                 update_num += 1
                 continue
             elif ret == 'error1':
-                return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据更新出错，错误位置为第【{}】行！'.format(i + 1))
             elif ret == 'error2':
-                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i))
+                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i + 1))
+            elif ret == 'error3':
+                return jsonify(code=RET.DATAERR, msg='项目编号不能为空！')
             else:
                 pass
     if int(data_type) == 1 and rep_project_li: