Commit 554851e1 by dong

fix

parent 73b43e08
......@@ -151,7 +151,7 @@ def get_flow(id, pageNum, pageSize):
# "createTime": i.createime,
"createBy": '',
"createTime": '',
"endTime": i.end_time.strftime("%Y-%m-%d") if type(i.end_time) != str else '',
"endTime": i.end_time.strftime("%Y-%m-%d") if i.end_time and type(i.end_time) != str else '',
"id": i.id,
"pageNum": pageNum,
"pageSize": pageSize,
......@@ -159,7 +159,7 @@ def get_flow(id, pageNum, pageSize):
"projectId": i.project_id,
# "remark": i.remark,
"remark": '',
"startTime": i.start_time.strftime("%Y-%m-%d") if type(i.start_time) != str else '',
"startTime": i.start_time.strftime("%Y-%m-%d") if i.start_time and type(i.start_time) != str else '',
"status": i.status,
"tProjectFlowStopList": get_flow_stop(i.id, pageNum, pageSize),
# "updateBy": i.updateBy,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment