Commit a58de8cd authored by liguangyu06's avatar liguangyu06
Browse files

优化

parent cd4773b3
...@@ -17,8 +17,8 @@ import json ...@@ -17,8 +17,8 @@ import json
module = "cmdc_special_version" module = "cmdc_special_version"
# 第一步登录后台运营系统获取token # 第一步登录后台运营系统获取token
username = commonFuc().get_business_data(module, "username_do_be") username = commonFuc().get_business_data(module, "username_admin2")
password = commonFuc().get_business_data(module, "password_do_be") password = commonFuc().get_business_data(module, "password_admin2")
# 获取登录后Cmdc_access_token # 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token() cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token) headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
...@@ -46,37 +46,27 @@ report_random = random.randint(0, len(result["data"]["list"]) - 1) ...@@ -46,37 +46,27 @@ report_random = random.randint(0, len(result["data"]["list"]) - 1)
# 获取上报植入信息 # 获取上报植入信息
customerInfo = result["data"]["list"][report_random]["customerCode"] customerInfo = result["data"]["list"][report_random]["customerCode"]
optionStr = result["data"]["list"][report_random]["optionStr"] optionStr = result["data"]["list"][report_random]["optionStr"]
reportAuditStatus = result["data"]["list"][report_random]["reportAuditStatus"] reportAuditStatus = (
result["data"]["list"][report_random]["reportAuditStatus"] if result["data"]["list"][report_random][
"reportAuditStatus"] else "")
companyCode = companyCode companyCode = companyCode
productLineCode = productLineCode productLineCode = productLineCode
reportHospitalCodeList = result["data"]["list"][report_random]["reportHospitalCode"] reportHospitalCodeList = (
result["data"]["list"][report_random]["reportHospitalCode"] if result["data"]["list"][report_random][
"reportHospitalCode"] else "")
deleteSign = result["data"]["list"][report_random]["deleteSign"] deleteSign = result["data"]["list"][report_random]["deleteSign"]
invoiceStatus = (result["data"]["list"][report_random]["invoiceStatus"] if result["data"]["list"][report_random][ invoiceStatus = (result["data"]["list"][report_random]["invoiceStatus"] if result["data"]["list"][report_random][
"invoiceStatus"] else "") "invoiceStatus"] else "")
reportStatus = result["data"]["list"][report_random]["reportStatus"] reportStatus = result["data"]["list"][report_random]["reportStatus"]
batchNumber = result["data"]["list"][report_random]["batchNumber"] batchNumber = result["data"]["list"][report_random]["batchNumber"]
reportDateStart = (
result["data"]["list"][report_random]["reportDateStr"][:10] + " 00:00:00" if result["data"]["list"][report_random][
"reportDateStr"] else "2000-01-1 00:00:00")
reportDateEnd = datetime.datetime.now().strftime("%Y-%m-%d") + " 23:59:59"
reportAuditTimeStart = (
result["data"]["list"][report_random]["reportAuditTimeStr"][:10] + " 00:00:00" if result["data"]["list"][report_random][
"reportAuditTimeStr"] else "2000-01-1 00:00:00")
reportAuditTimeEnd = datetime.datetime.now().strftime("%Y-%m-%d") + " 23:59:59"
reportManufacturerTimeStart = (
result["data"]["list"][report_random]["reportManufacturerTime"][:10] + " 00:00:00" if result["data"]["list"][report_random][
"reportManufacturerTime"] else "2000-01-01 00:00:00")
reportManufacturerTimeEnd = datetime.datetime.now().strftime("%Y-%m-%d") + " 23:59:59"
# 第三步进行列表查询条件验证 # 第三步进行列表查询条件验证
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url33") url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url33")
request_body = commonFuc().get_business_data(module, "payload33", customerInfo, optionStr, reportAuditStatus, request_body = commonFuc().get_business_data(module, "payload33", customerInfo, optionStr, reportAuditStatus,
companyCode, companyCode,
productLineCode, reportHospitalCodeList, deleteSign, invoiceStatus, productLineCode, reportHospitalCodeList, deleteSign, invoiceStatus,
reportStatus, batchNumber, reportDateStart, reportDateEnd, reportStatus, batchNumber)
reportAuditTimeStart, # print(request_body)
reportAuditTimeEnd, reportManufacturerTimeStart, reportManufacturerTimeEnd)
""" """
场景: 列表查询条件验证_上报植入列表 场景: 列表查询条件验证_上报植入列表
...@@ -91,6 +81,7 @@ api_time = float(result.elapsed.total_seconds()) ...@@ -91,6 +81,7 @@ api_time = float(result.elapsed.total_seconds())
# 获取上报植入信息 # 获取上报植入信息
result = json.loads(result.content) result = json.loads(result.content)
# print(result)
result = {"batchNumber": result["data"]["list"][0]["batchNumber"]} result = {"batchNumber": result["data"]["list"][0]["batchNumber"]}
# 将接口响应时间添加至result # 将接口响应时间添加至result
result["api_time"] = api_time result["api_time"] = api_time
......
...@@ -259,7 +259,7 @@ checkDict42: {"success":false,"code":"ERROR","message":"产品线编码不能为 ...@@ -259,7 +259,7 @@ checkDict42: {"success":false,"code":"ERROR","message":"产品线编码不能为
#测试场景33:列表查询条件验证_上报植入列表 #测试场景33:列表查询条件验证_上报植入列表
"url33": "/order/public/getReportList" "url33": "/order/public/getReportList"
"payload33": {"customerInfo":"%s","optionStr":"%s","reportAuditStatus":"%s","status":null,"companyCode":"%s","productLineCode":"%s","reportHospitalCode":"","reportHospitalCodeList":["%s"],"deleteSign":"%s","numberSource":"","invoiceStatus":"%s","reportStatus":"%s","reportQueryType":0,"batchNumber":"%s","pageNum":1,"pageSize":10,"pageStart":1,"reportDateStart":"%s","reportDateEnd":"%s","reportAuditTimeStart":"%s","reportAuditTimeEnd":"%s","reportManufacturerTimeStart":"%s","reportManufacturerTimeEnd":"%s"} "payload33": {"customerInfo":"%s","optionStr":"%s","reportAuditStatus":"%s","status":null,"companyCode":"%s","productLineCode":"%s","reportHospitalCode":"","reportHospitalCodeList":["%s"],"deleteSign":"%s","numberSource":"","invoiceStatus":"%s","reportStatus":"%s","reportQueryType":0,"batchNumber":"%s","pageNum":1,"pageSize":10,"pageStart":1,"reportDateStart":null,"reportDateEnd":null,"reportAuditTimeStart":null,"reportAuditTimeEnd":null,"reportManufacturerTimeStart":null,"reportManufacturerTimeEnd":null}
#预期结果 #预期结果
checkDict33: {"batchNumber":"%s"} checkDict33: {"batchNumber":"%s"}
#获取植入上报信息 #获取植入上报信息
......
Supports Markdown
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