fix20230317

apps/inves_manage/project_manager.py

@@ -296,7 +296,7 @@ def upload_project_data2():
             return jsonify(code=RET.NODATA,
                            msg="表格内无有效数据！请尝试 <清空浏览器缓存> 后下载最新模板，根据模板提示信息编辑数据后再次上传。(注：第三行为首行有效数据不能为空、第一行和第二行无法读取。)")
         project_name = row_content[1]  # 项目名称
-        if project_name == '年产100万立方商砼项目':
+        if project_name == '智能制造系统项目（二期）':
             print(project_name)
         # 判断该项目是否已经存在
         project_obj = ProjectManagement.query.filter_by(project_name=project_name, is_delete=0).first()
@@ -329,20 +329,34 @@ def upload_project_data2():
             sign_time = row_content[19]  # 签约时间
             project_year = ''
             if sign_time:
-                y, m, d, h, i, s = xlrd.xldate_as_tuple(sign_time, data.datemode)
-                sign_time = "{0}-{1}-{2}".format(y, m, d)
-                # if sign_time:
+                try:
+                    y, m, d, h, i, s = xlrd.xldate_as_tuple(sign_time, data.datemode)
+                    sign_time = "{0}-{1}-{2}".format(y, m, d)
+                    # if sign_time:
+                except:
+                    sign_time = sign_time.split('/')
+                    sign_time = sign_time[0] + '-' + sign_time[1] + '-' + sign_time[2]
+
                 project_year = int(sign_time.split('-')[0])
 
             start_time = row_content[20]  # 开工时间
             if start_time:
-                y, m, d, h, i, s = xlrd.xldate_as_tuple(start_time, data.datemode)
-                start_time = "{0}-{1}-{2}".format(y, m, d)
+                try:
+                    y, m, d, h, i, s = xlrd.xldate_as_tuple(start_time, data.datemode)
+                    start_time = "{0}-{1}-{2}".format(y, m, d)
+                except:
+                    start_time = start_time.split('/')
+                    start_time = start_time[0] + '-' + start_time[1] + '-' + start_time[2]
+
 
             end_time = row_content[21]  # 竣工时间
             if end_time:
-                y, m, d, h, i, s = xlrd.xldate_as_tuple(end_time, data.datemode)
-                end_time = "{0}-{1}-{2}".format(y, m, d)
+                try:
+                    y, m, d, h, i, s = xlrd.xldate_as_tuple(end_time, data.datemode)
+                    end_time = "{0}-{1}-{2}".format(y, m, d)
+                except:
+                    end_time = end_time.split('/')
+                    end_time = end_time[0] + '-' + end_time[1] + '-' + end_time[2]
 
             is_fixed_investment = row_content[22]  # 固定资产投资项目
             investment_year = row_content[23]  # 资金到位本年累计（万元）
@@ -360,6 +374,7 @@ def upload_project_data2():
             # 表示操作失败，回滚数据库操作
             data = '第{}行'.format(i) + project_name
             current_app.logger.error(e)
+            db.session.rollback()
             return jsonify(code=RET.DBERR, msg=data)
 
         if not project_name: