正在显示
43 个修改的文件
包含
697 行增加
和
644 行删除
api/app_api/login_api/gettimestamp_api.yml
0 → 100644
@@ -5,9 +5,6 @@ from urllib import parse | @@ -5,9 +5,6 @@ from urllib import parse | ||
5 | from helpfunc.db_func import * | 5 | from helpfunc.db_func import * |
6 | from helpfunc.header_func import * | 6 | from helpfunc.header_func import * |
7 | from helpfunc.login_func import * | 7 | from helpfunc.login_func import * |
8 | -from helpfunc.pg_db_loot_func import * | ||
9 | -from helpfunc.pg_db_bid_func import * | ||
10 | -from helpfunc.pg_db_appoint_func import * | ||
11 | 8 | ||
12 | 9 | ||
13 | import time,datetime,re | 10 | import time,datetime,re |
@@ -3,18 +3,21 @@ | @@ -3,18 +3,21 @@ | ||
3 | # @File :db_func.py | 3 | # @File :db_func.py |
4 | import psycopg2 | 4 | import psycopg2 |
5 | 5 | ||
6 | +db_config ={'database': "mmmworthtest", | ||
7 | + 'user': "bianxinhua", | ||
8 | + 'password': "bianxinhua_123", | ||
9 | + 'host': "114.55.200.59", | ||
10 | + 'port': "31543"} | ||
11 | + | ||
6 | def GetConnect(): | 12 | def GetConnect(): |
7 | conn = False | 13 | conn = False |
8 | try: | 14 | try: |
9 | - conn = psycopg2.connect(database="mmmworthtest", | ||
10 | - user="bianxinhua", | ||
11 | - password="bianxinhua_123", | ||
12 | - host="114.55.200.59", | ||
13 | - port="31543") | 15 | + conn = psycopg2.connect(**db_config) |
14 | except Exception as err: | 16 | except Exception as err: |
15 | print("连接数据库失败,%s" % err) | 17 | print("连接数据库失败,%s" % err) |
16 | return conn | 18 | return conn |
17 | 19 | ||
20 | + | ||
18 | def setup_hook_clean_db(company_id): | 21 | def setup_hook_clean_db(company_id): |
19 | """ | 22 | """ |
20 | 初始化时清理数据库中的历史数据 | 23 | 初始化时清理数据库中的历史数据 |
@@ -24,37 +27,37 @@ def setup_hook_clean_db(company_id): | @@ -24,37 +27,37 @@ def setup_hook_clean_db(company_id): | ||
24 | cursor = db.cursor() | 27 | cursor = db.cursor() |
25 | try: | 28 | try: |
26 | #获得素币 | 29 | #获得素币 |
27 | - cursor.execute('''DELETE FROM su_money_transaction_records smrt WHERE ( smrt.employee @> '{"uid":3248817613863936 }' or smrt.employee @> '{"uid":3247366011913216 }' or smrt.employee @> '{"uid":3248817613835264 }'or smrt.employee @> '{"uid":3248817613892608 }')''') | 30 | + cursor.execute("DELETE FROM su_money_transaction_records smrt WHERE smrt.operator#>>'{{uid}}' in (select uid::TEXT from employees where company_id={})".format(company_id)) |
28 | db.commit() | 31 | db.commit() |
29 | #发送推送 | 32 | #发送推送 |
30 | - cursor.execute('''DELETE FROM sent_notifications sn WHERE ( sn.receiver @> '{"uid":3248817613863936 }' OR sn.receiver @> '{"uid":3247366011913216 }' OR sn.receiver @> '{"uid":3248817613835264 }' OR sn.receiver @> '{"uid":3248817613892608 }' )''') | 33 | + cursor.execute('DELETE FROM sent_notifications sn WHERE sn.notification_id in (select n.id FROM notifications n WHERE n.external_resource IN ( SELECT t.ID FROM tasks t WHERE t.company_id ={} ))'.format(company_id)) |
31 | db.commit() | 34 | db.commit() |
32 | #任务接收者 | 35 | #任务接收者 |
33 | - cursor.execute('''DELETE FROM rob_infos ri WHERE ri.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id ={} )'''.format(company_id)) | 36 | + cursor.execute('DELETE FROM rob_infos ri WHERE ri.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id ={} )'.format(company_id)) |
34 | db.commit() | 37 | db.commit() |
35 | #驳回任务 | 38 | #驳回任务 |
36 | - cursor.execute('''DELETE FROM reject_task_records rtr WHERE rtr.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'''.format(company_id)) | 39 | + cursor.execute('DELETE FROM reject_task_records rtr WHERE rtr.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'.format(company_id)) |
37 | db.commit() | 40 | db.commit() |
38 | #关闭任务 | 41 | #关闭任务 |
39 | - cursor.execute('''DELETE FROM off_task_records otr WHERE otr.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'''.format(company_id)) | 42 | + cursor.execute('DELETE FROM off_task_records otr WHERE otr.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'.format(company_id)) |
40 | db.commit() | 43 | db.commit() |
41 | #通知 | 44 | #通知 |
42 | - cursor.execute('''DELETE FROM notifications n WHERE n.external_resource IN ( SELECT ID FROM tasks T WHERE T.company_id ={} )'''.format(company_id)) | 45 | + cursor.execute('DELETE FROM notifications n WHERE n.external_resource IN ( SELECT ID FROM tasks T WHERE T.company_id ={} )'.format(company_id)) |
43 | db.commit() | 46 | db.commit() |
44 | #参与竞标 | 47 | #参与竞标 |
45 | - cursor.execute('''DELETE FROM bid_infos bi WHERE bi.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'''.format(company_id)) | 48 | + cursor.execute('DELETE FROM bid_infos bi WHERE bi.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'.format(company_id)) |
46 | db.commit() | 49 | db.commit() |
47 | #中标 | 50 | #中标 |
48 | - cursor.execute('''DELETE FROM bidder_infos bin WHERE bin.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'''.format(company_id)) | 51 | + cursor.execute('DELETE FROM bidder_infos bin WHERE bin.task_id IN ( SELECT ID FROM tasks T WHERE T.company_id = {} )'.format(company_id)) |
49 | db.commit() | 52 | db.commit() |
50 | #任务列表 | 53 | #任务列表 |
54 | + cursor.execute('DELETE from tasks t where t.company_id ={}'.format(company_id)) | ||
51 | db.commit() | 55 | db.commit() |
52 | - cursor.execute('''DELETE from tasks t where t.company_id ={};'''.format(company_id)) | ||
53 | - print(cursor.rowcount) | 56 | + cursor.execute('update employees set su_money=0 where company_id={}'.format(company_id)) |
54 | db.commit() | 57 | db.commit() |
55 | print("delete 成功") | 58 | print("delete 成功") |
56 | - except: | 59 | + except Exception as err: |
57 | # 发生错误时回滚 | 60 | # 发生错误时回滚 |
58 | db.rollback() | 61 | db.rollback() |
59 | - print('回滚操作') | 62 | + print('this is:', err) |
60 | db.close() | 63 | db.close() |
helpfunc/pg_db_appoint_func.py
已删除
100644 → 0
1 | -#! /usr/bin/env python | ||
2 | -# -*- coding: utf-8 -*- | ||
3 | -# Date: 2020/7/12 16:27 | ||
4 | -# @Author:bxh | ||
5 | -# @file: pg_db_func.py | ||
6 | -import psycopg2 | ||
7 | -from datetime import * | ||
8 | - | ||
9 | -# 获得连接 | ||
10 | -def GetConnect(): | ||
11 | - conn = False | ||
12 | - try: | ||
13 | - conn = psycopg2.connect(database="mmmworthtest", | ||
14 | - user="bianxinhua", | ||
15 | - password="bianxinhua_123", | ||
16 | - host="114.55.200.59", | ||
17 | - port="31543") | ||
18 | - except Exception as err: | ||
19 | - print("连接数据库失败,%s" % err) | ||
20 | - return conn | ||
21 | - | ||
22 | -#获取指派任务单的状态:待发布 | ||
23 | -def get_appoint_task_status_1_from_database(): | ||
24 | - db = GetConnect() | ||
25 | - cursor = db.cursor() | ||
26 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 3 and task_status = 1 and id = {} '''.format(get_appoint_task_id()) | ||
27 | - # print(sql) | ||
28 | - try: | ||
29 | - cursor.execute(sql) | ||
30 | - result = cursor.fetchone() | ||
31 | - return result[0] | ||
32 | - except Exception as err: | ||
33 | - # 发生错误时回滚 | ||
34 | - print(err) | ||
35 | - db.rollback() | ||
36 | - db.close() | ||
37 | - | ||
38 | -#获取指派任务单的状态:进行中 | ||
39 | -def get_appoint_task_status_3_from_database(): | ||
40 | - db = GetConnect() | ||
41 | - cursor = db.cursor() | ||
42 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 3 and task_status = 3 and id = {} '''.format(get_appoint_task_id()) | ||
43 | - # print(sql) | ||
44 | - try: | ||
45 | - cursor.execute(sql) | ||
46 | - result = cursor.fetchone() | ||
47 | - return result[0] | ||
48 | - except Exception as err: | ||
49 | - # 发生错误时回滚 | ||
50 | - print(err) | ||
51 | - db.rollback() | ||
52 | - db.close() | ||
53 | -#获取指派任务单的状态:待验收 | ||
54 | -def get_appoint_task_status_4_from_database(): | ||
55 | - db = GetConnect() | ||
56 | - cursor = db.cursor() | ||
57 | - sql = '''select task_status from tasks t where t.company_id = 366 and task_type = 3 and t.task_status = 4 and id = {}'''.format(get_appoint_task_id()) | ||
58 | - # print(sql) | ||
59 | - try: | ||
60 | - cursor.execute(sql) | ||
61 | - result = cursor.fetchone() | ||
62 | - return result[0] | ||
63 | - except Exception as err: | ||
64 | - # 发生错误时回滚 | ||
65 | - print(err) | ||
66 | - db.rollback() | ||
67 | - db.close() | ||
68 | -#获取指派任务单的状态:已完成 | ||
69 | -def get_appoint_task_status_5_from_database(): | ||
70 | - db = GetConnect() | ||
71 | - cursor = db.cursor() | ||
72 | - sql = '''select task_status from tasks t where t.company_id = 366 and task_type = 3 and t.task_status = 5 and id = {}'''.format(get_appoint_task_id()) | ||
73 | - # print(sql) | ||
74 | - try: | ||
75 | - cursor.execute(sql) | ||
76 | - result = cursor.fetchone() | ||
77 | - return result[0] | ||
78 | - except Exception as err: | ||
79 | - # 发生错误时回滚 | ||
80 | - print(err) | ||
81 | - db.rollback() | ||
82 | - db.close() | ||
83 | - | ||
84 | -#获取任务单的状态:已关闭 | ||
85 | -def get_appoint_task_status_6_from_database(): | ||
86 | - db = GetConnect() | ||
87 | - cursor = db.cursor() | ||
88 | - sql = '''select task_status from tasks t where t.company_id = 366 and task_type = 3 and t.task_status = 6 and id = {}'''.format(get_appoint_task_id()) | ||
89 | - # print(sql) | ||
90 | - try: | ||
91 | - cursor.execute(sql) | ||
92 | - result = cursor.fetchone() | ||
93 | - return result[0] | ||
94 | - except Exception as err: | ||
95 | - # 发生错误时回滚 | ||
96 | - print(err) | ||
97 | - db.rollback() | ||
98 | - db.close() |
helpfunc/pg_db_bid_func.py
已删除
100644 → 0
1 | -#! /usr/bin/env python | ||
2 | -# -*- coding: utf-8 -*- | ||
3 | -# Date: 2020/7/12 16:27 | ||
4 | -# @Author:bxh | ||
5 | -# @file: pg_db_func.py | ||
6 | -import psycopg2 | ||
7 | -from datetime import * | ||
8 | - | ||
9 | -# 获得连接 | ||
10 | -def GetConnect(): | ||
11 | - conn = False | ||
12 | - try: | ||
13 | - conn = psycopg2.connect(database="mmmworthtest", | ||
14 | - user="bianxinhua", | ||
15 | - password="bianxinhua_123", | ||
16 | - host="114.55.200.59", | ||
17 | - port="31543") | ||
18 | - except Exception as err: | ||
19 | - print("连接数据库失败,%s" % err) | ||
20 | - return conn | ||
21 | - | ||
22 | -#获取竞标任务单的状态:待发布 | ||
23 | -def get_bid_task_status_1_from_database(): | ||
24 | - db = GetConnect() | ||
25 | - cursor = db.cursor() | ||
26 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 2 and task_status = 1 and id = {} '''.format(get_bid_task_id()) | ||
27 | - # print(sql) | ||
28 | - try: | ||
29 | - cursor.execute(sql) | ||
30 | - result = cursor.fetchone() | ||
31 | - return result[0] | ||
32 | - except Exception as err: | ||
33 | - # 发生错误时回滚 | ||
34 | - print(err) | ||
35 | - db.rollback() | ||
36 | - db.close() | ||
37 | - | ||
38 | -#获取竞标任务单的状态:待领取 | ||
39 | -def get_bid_task_status_2_from_database(): | ||
40 | - db = GetConnect() | ||
41 | - cursor = db.cursor() | ||
42 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 2 and task_status = 2 and id = {} '''.format(get_bid_task_id()) | ||
43 | - print(sql) | ||
44 | - try: | ||
45 | - cursor.execute(sql) | ||
46 | - result = cursor.fetchone() | ||
47 | - return result[0] | ||
48 | - except Exception as err: | ||
49 | - # 发生错误时回滚 | ||
50 | - print(err) | ||
51 | - db.rollback() | ||
52 | - db.close() | ||
53 | -#获取竞标任务单的状态:进行中 | ||
54 | -def get_bid_task_status_3_from_database(): | ||
55 | - db = GetConnect() | ||
56 | - cursor = db.cursor() | ||
57 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 2 and task_status = 3 and id = {} '''.format(get_bid_task_id()) | ||
58 | - # print(sql) | ||
59 | - try: | ||
60 | - cursor.execute(sql) | ||
61 | - result = cursor.fetchone() | ||
62 | - return result[0] | ||
63 | - except Exception as err: | ||
64 | - # 发生错误时回滚 | ||
65 | - print(err) | ||
66 | - db.rollback() | ||
67 | - db.close() | ||
68 | -#获取竞标任务单的状态:待验收 | ||
69 | -def get_bid_task_status_4_from_database(): | ||
70 | - db = GetConnect() | ||
71 | - cursor = db.cursor() | ||
72 | - sql = '''select task_status from tasks t where t.company_id = 366 and task_type = 2 and t.task_status = 4 and t.receiver_uid = '3248817613892608' and id = {}'''.format(get_bid_task_id()) | ||
73 | - # print(sql) | ||
74 | - try: | ||
75 | - cursor.execute(sql) | ||
76 | - result = cursor.fetchone() | ||
77 | - return result[0] | ||
78 | - except Exception as err: | ||
79 | - # 发生错误时回滚 | ||
80 | - print(err) | ||
81 | - db.rollback() | ||
82 | - db.close() | ||
83 | -# print(get_bid_task_status_4_from_database()) | ||
84 | -#获取竞标任务单的状态:已完成 | ||
85 | -def get_bid_task_status_5_from_database(): | ||
86 | - db = GetConnect() | ||
87 | - cursor = db.cursor() | ||
88 | - sql = '''select task_status from tasks t where t.company_id = 366 and task_type = 2 and t.task_status = 5 and id = {}'''.format(get_bid_task_id()) | ||
89 | - # print(sql) | ||
90 | - try: | ||
91 | - cursor.execute(sql) | ||
92 | - result = cursor.fetchone() | ||
93 | - return result[0] | ||
94 | - except Exception as err: | ||
95 | - # 发生错误时回滚 | ||
96 | - print(err) | ||
97 | - db.rollback() | ||
98 | - db.close() | ||
99 | - | ||
100 | -#获取任务单的状态:已关闭 | ||
101 | -def get_bid_task_status_6_from_database(): | ||
102 | - db = GetConnect() | ||
103 | - cursor = db.cursor() | ||
104 | - sql = '''select task_status from tasks t where t.company_id = 366 and task_type = 2 and t.task_status = 6 and id = {}'''.format(get_bid_task_id()) | ||
105 | - # print(sql) | ||
106 | - try: | ||
107 | - cursor.execute(sql) | ||
108 | - result = cursor.fetchone() | ||
109 | - return result[0] | ||
110 | - except Exception as err: | ||
111 | - # 发生错误时回滚 | ||
112 | - print(err) | ||
113 | - db.rollback() | ||
114 | - db.close() |
helpfunc/pg_db_loot_func.py
已删除
100644 → 0
1 | -#! /usr/bin/env python | ||
2 | -# -*- coding: utf-8 -*- | ||
3 | -# Date: 2020/7/12 16:27 | ||
4 | -# @Author:bxh | ||
5 | -# @file: pg_db_func.py | ||
6 | - | ||
7 | -import psycopg2 | ||
8 | -from datetime import * | ||
9 | - | ||
10 | - | ||
11 | - | ||
12 | -def get_today(): | ||
13 | - today = datetime.now(timezone.utc).astimezone().isoformat() | ||
14 | - return today | ||
15 | - | ||
16 | -# 获得连接 | ||
17 | -def GetConnect(): | ||
18 | - conn = False | ||
19 | - try: | ||
20 | - conn = psycopg2.connect(database="mmmworthtest", | ||
21 | - user="bianxinhua", | ||
22 | - password="bianxinhua_123", | ||
23 | - host="114.55.200.59", | ||
24 | - port="31543") | ||
25 | - except Exception as err: | ||
26 | - print("连接数据库失败,%s" % err) | ||
27 | - return conn | ||
28 | -#获取员工的姓名 | ||
29 | -def get_employees_name_from_database(): | ||
30 | - db = GetConnect() | ||
31 | - cursor = db.cursor() | ||
32 | - sql = ''' select employee_name from employees e where e.company_id = 366 order by id desc''' | ||
33 | - # print(sql) | ||
34 | - try: | ||
35 | - cursor.execute(sql) | ||
36 | - result = cursor.fetchone() | ||
37 | - return result[0] | ||
38 | - except Exception as err: | ||
39 | - # 发生错误时回滚 | ||
40 | - print(err) | ||
41 | - db.rollback() | ||
42 | - db.close() | ||
43 | - | ||
44 | -#获取员工的uid | ||
45 | -def get_uid_from_database(): | ||
46 | - db = GetConnect() | ||
47 | - cursor = db.cursor() | ||
48 | - sql = ''' select uid from employees e where e.company_id = 366 order by id desc''' | ||
49 | - # print(sql) | ||
50 | - try: | ||
51 | - cursor.execute(sql) | ||
52 | - result = cursor.fetchone() | ||
53 | - return result[0] | ||
54 | - except Exception as err: | ||
55 | - # 发生错误时回滚 | ||
56 | - print(err) | ||
57 | - db.rollback() | ||
58 | - db.close() | ||
59 | -#获取超级管理员账号 | ||
60 | -def get_employee_account_from_database(): | ||
61 | - db = GetConnect() | ||
62 | - cursor = db.cursor() | ||
63 | - sql = '''select employee_account from employees where company_id = 366 order by id desc ''' | ||
64 | - # print(sql) | ||
65 | - try: | ||
66 | - cursor.execute(sql) | ||
67 | - result = cursor.fetchone() | ||
68 | - return result[0] | ||
69 | - except Exception as err: | ||
70 | - # 发生错误时回滚 | ||
71 | - print(err) | ||
72 | - db.rollback() | ||
73 | - db.close() | ||
74 | - | ||
75 | -#获取抢单任务单的状态:待发布 | ||
76 | -def get_task_status_1_from_database(): | ||
77 | - db = GetConnect() | ||
78 | - cursor = db.cursor() | ||
79 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and task_status = 1 and id = {} '''.format(get_loot_task_id()) | ||
80 | - # print(sql) | ||
81 | - try: | ||
82 | - cursor.execute(sql) | ||
83 | - result = cursor.fetchone() | ||
84 | - return result[0] | ||
85 | - except Exception as err: | ||
86 | - # 发生错误时回滚 | ||
87 | - print(err) | ||
88 | - db.rollback() | ||
89 | - db.close() | ||
90 | - | ||
91 | -#获取抢单任务单的状态:待领取 | ||
92 | -def get_task_status_2_from_database(): | ||
93 | - db = GetConnect() | ||
94 | - cursor = db.cursor() | ||
95 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and task_status = 2 and id = {} '''.format(get_loot_task_id()) | ||
96 | - print(sql) | ||
97 | - try: | ||
98 | - cursor.execute(sql) | ||
99 | - result = cursor.fetchone() | ||
100 | - return result[0] | ||
101 | - except Exception as err: | ||
102 | - # 发生错误时回滚 | ||
103 | - print(err) | ||
104 | - db.rollback() | ||
105 | - db.close() | ||
106 | -#获取抢单任务单的状态:进行中 | ||
107 | -def get_task_status_3_from_database(): | ||
108 | - db = GetConnect() | ||
109 | - cursor = db.cursor() | ||
110 | - sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and task_status = 3 and id = {} '''.format(get_loot_task_id()) | ||
111 | - # print(sql) | ||
112 | - try: | ||
113 | - cursor.execute(sql) | ||
114 | - result = cursor.fetchone() | ||
115 | - return result[0] | ||
116 | - except Exception as err: | ||
117 | - # 发生错误时回滚 | ||
118 | - print(err) | ||
119 | - db.rollback() | ||
120 | - db.close() | ||
121 | - | ||
122 | -# #获取抢单任务单的状态:待确认 | ||
123 | -def get_task_status_7_from_database(): | ||
124 | - db = GetConnect() | ||
125 | - cursor = db.cursor() | ||
126 | - sql = '''select task_status from tasks where company_id = 366 and task_status = 7 and id = {}'''.format(get_loot_task_id()) | ||
127 | - print(sql) | ||
128 | - try: | ||
129 | - cursor.execute(sql) | ||
130 | - result = cursor.fetchone() | ||
131 | - return result[0] | ||
132 | - except Exception as err: | ||
133 | - # 发生错误时回滚 | ||
134 | - print(err) | ||
135 | - db.rollback() | ||
136 | - db.close() | ||
137 | - | ||
138 | -#获取任务单的状态:待验收 | ||
139 | -def get_task_status_4_from_database(): | ||
140 | - db = GetConnect() | ||
141 | - cursor = db.cursor() | ||
142 | - sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3248817613892608' and id = {}'''.format(get_loot_task_id()) | ||
143 | - # print(sql) | ||
144 | - try: | ||
145 | - cursor.execute(sql) | ||
146 | - result = cursor.fetchone() | ||
147 | - return result[0] | ||
148 | - except Exception as err: | ||
149 | - # 发生错误时回滚 | ||
150 | - print(err) | ||
151 | - db.rollback() | ||
152 | - db.close() | ||
153 | - | ||
154 | -#获取任务单的状态:已完成 | ||
155 | -def get_task_status_5_from_database(): | ||
156 | - db = GetConnect() | ||
157 | - cursor = db.cursor() | ||
158 | - sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 5 and id = {}'''.format(get_loot_task_id()) | ||
159 | - # print(sql) | ||
160 | - try: | ||
161 | - cursor.execute(sql) | ||
162 | - result = cursor.fetchone() | ||
163 | - return result[0] | ||
164 | - except Exception as err: | ||
165 | - # 发生错误时回滚 | ||
166 | - print(err) | ||
167 | - db.rollback() | ||
168 | - db.close() | ||
169 | - | ||
170 | -#获取任务单的状态:已关闭 | ||
171 | -def get_task_status_6_from_database(): | ||
172 | - db = GetConnect() | ||
173 | - cursor = db.cursor() | ||
174 | - sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 6 and id = {}'''.format(get_loot_task_id()) | ||
175 | - # print(sql) | ||
176 | - try: | ||
177 | - cursor.execute(sql) | ||
178 | - result = cursor.fetchone() | ||
179 | - return result[0] | ||
180 | - except Exception as err: | ||
181 | - # 发生错误时回滚 | ||
182 | - print(err) | ||
183 | - db.rollback() | ||
184 | - db.close() |
1 | config: | 1 | config: |
2 | name: ME007-抢单任务被领取-任务数量统计待领取-1,待确认+1 | 2 | name: ME007-抢单任务被领取-任务数量统计待领取-1,待确认+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -17,6 +12,9 @@ teststeps: | @@ -17,6 +12,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 12 | - name: 发布抢单任务 |
18 | variables: | 13 | variables: |
19 | action: 1 | 14 | action: 1 |
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 18 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 19 | ||
22 | - name: 第一次查看我发布的 | 20 | - name: 第一次查看我发布的 |
@@ -41,10 +39,10 @@ teststeps: | @@ -41,10 +39,10 @@ teststeps: | ||
41 | api: api/app_api/task_api/contendTasks_api.yml | 39 | api: api/app_api/task_api/contendTasks_api.yml |
42 | extract: | 40 | extract: |
43 | - tasks_id: content.data.tasks.0.id | 41 | - tasks_id: content.data.tasks.0.id |
44 | - validate: | ||
45 | - - eq: | ||
46 | - - content.data.tasks.0.title | ||
47 | - - $title | 42 | +# validate: |
43 | +# - eq: | ||
44 | +# - content.data.tasks.0.title | ||
45 | +# - $title | ||
48 | 46 | ||
49 | - name: 领取任务 | 47 | - name: 领取任务 |
50 | variables: | 48 | variables: |
1 | config: | 1 | config: |
2 | name: ME008-竞标任务被领取-任务数量统计不变,还是待领取状态 | 2 | name: ME008-竞标任务被领取-任务数量统计不变,还是待领取状态 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | - name: 第一次查看我发布的 | 23 | - name: 第一次查看我发布的 |
@@ -44,10 +42,10 @@ teststeps: | @@ -44,10 +42,10 @@ teststeps: | ||
44 | api: api/app_api/task_api/contendTasks_api.yml | 42 | api: api/app_api/task_api/contendTasks_api.yml |
45 | extract: | 43 | extract: |
46 | - tasks_id: content.data.tasks.0.id | 44 | - tasks_id: content.data.tasks.0.id |
47 | - validate: | ||
48 | - - eq: | ||
49 | - - content.data.tasks.0.title | ||
50 | - - $title | 45 | +# validate: |
46 | +# - eq: | ||
47 | +# - content.data.tasks.0.title | ||
48 | +# - $title | ||
51 | 49 | ||
52 | - name: 领取竞标任务 | 50 | - name: 领取竞标任务 |
53 | variables: | 51 | variables: |
1 | config: | 1 | config: |
2 | name: ME009-抢单任务被确认-任务数量统计待确认-1,进行中+1 | 2 | name: ME009-抢单任务被确认-任务数量统计待确认-1,进行中+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -17,6 +12,9 @@ teststeps: | @@ -17,6 +12,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 12 | - name: 发布抢单任务 |
18 | variables: | 13 | variables: |
19 | action: 1 | 14 | action: 1 |
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 18 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 19 | ||
22 | 20 | ||
@@ -32,10 +30,11 @@ teststeps: | @@ -32,10 +30,11 @@ teststeps: | ||
32 | api: api/app_api/task_api/contendTasks_api.yml | 30 | api: api/app_api/task_api/contendTasks_api.yml |
33 | extract: | 31 | extract: |
34 | - tasks_id: content.data.tasks.0.id | 32 | - tasks_id: content.data.tasks.0.id |
35 | - validate: | ||
36 | - - eq: | ||
37 | - - content.data.tasks.0.title | ||
38 | - - $title | 33 | + - tasks_title: content.data.tasks.0.title |
34 | +# validate: | ||
35 | +# - eq: | ||
36 | +# - content.data.tasks.0.title | ||
37 | +# - $title | ||
39 | 38 | ||
40 | - name: 领取任务 | 39 | - name: 领取任务 |
41 | variables: | 40 | variables: |
@@ -66,7 +65,7 @@ teststeps: | @@ -66,7 +65,7 @@ teststeps: | ||
66 | validate: | 65 | validate: |
67 | - eq: | 66 | - eq: |
68 | - content.data.tasks.0.title | 67 | - content.data.tasks.0.title |
69 | - - $title | 68 | + - $tasks_title |
70 | - eq: | 69 | - eq: |
71 | - content.data.tasks.0.id | 70 | - content.data.tasks.0.id |
72 | - $tasks_id | 71 | - $tasks_id |
1 | config: | 1 | config: |
2 | name: ME010-竞标人确认-任务数量统计待领取-1,进行中+1 | 2 | name: ME010-竞标人确认-任务数量统计待领取-1,进行中+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/contendTasks_api.yml | 33 | api: api/app_api/task_api/contendTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 领取竞标任务 | 42 | - name: 领取竞标任务 |
44 | variables: | 43 | variables: |
@@ -69,7 +68,7 @@ teststeps: | @@ -69,7 +68,7 @@ teststeps: | ||
69 | validate: | 68 | validate: |
70 | - eq: | 69 | - eq: |
71 | - content.data.tasks.0.title | 70 | - content.data.tasks.0.title |
72 | - - $title | 71 | + - $tasks_title |
73 | - eq: | 72 | - eq: |
74 | - content.data.tasks.0.id | 73 | - content.data.tasks.0.id |
75 | - $tasks_id | 74 | - $tasks_id |
@@ -86,7 +85,7 @@ teststeps: | @@ -86,7 +85,7 @@ teststeps: | ||
86 | - 获取详情成功 | 85 | - 获取详情成功 |
87 | - eq: | 86 | - eq: |
88 | - content.data.task.title | 87 | - content.data.task.title |
89 | - - $title | 88 | + - $tasks_title |
90 | 89 | ||
91 | - name: 竞标人中标确认 | 90 | - name: 竞标人中标确认 |
92 | variables: | 91 | variables: |
1 | config: | 1 | config: |
2 | name: ME011-抢单任务已完成待验收-任务数量统计进行中-1,待验收+1 | 2 | name: ME011-抢单任务已完成待验收-任务数量统计进行中-1,待验收+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | 4 | ||
9 | 5 | ||
10 | teststeps: | 6 | teststeps: |
@@ -17,6 +13,9 @@ teststeps: | @@ -17,6 +13,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 13 | - name: 发布抢单任务 |
18 | variables: | 14 | variables: |
19 | action: 1 | 15 | action: 1 |
16 | + title: '抢单任务标题${get_nowtime()}' | ||
17 | + content: '抢单任务内容${get_nowtime()}' | ||
18 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 19 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 20 | ||
22 | 21 | ||
@@ -32,10 +31,11 @@ teststeps: | @@ -32,10 +31,11 @@ teststeps: | ||
32 | api: api/app_api/task_api/contendTasks_api.yml | 31 | api: api/app_api/task_api/contendTasks_api.yml |
33 | extract: | 32 | extract: |
34 | - tasks_id: content.data.tasks.0.id | 33 | - tasks_id: content.data.tasks.0.id |
35 | - validate: | ||
36 | - - eq: | ||
37 | - - content.data.tasks.0.title | ||
38 | - - $title | 34 | + - tasks_title: content.data.tasks.0.title |
35 | +# validate: | ||
36 | +# - eq: | ||
37 | +# - content.data.tasks.0.title | ||
38 | +# - $title | ||
39 | 39 | ||
40 | - name: 领取任务 | 40 | - name: 领取任务 |
41 | variables: | 41 | variables: |
@@ -56,7 +56,7 @@ teststeps: | @@ -56,7 +56,7 @@ teststeps: | ||
56 | validate: | 56 | validate: |
57 | - eq: | 57 | - eq: |
58 | - content.data.tasks.0.title | 58 | - content.data.tasks.0.title |
59 | - - $title | 59 | + - $tasks_title |
60 | - eq: | 60 | - eq: |
61 | - content.data.tasks.0.id | 61 | - content.data.tasks.0.id |
62 | - $tasks_id | 62 | - $tasks_id |
1 | config: | 1 | config: |
2 | name: ME012-竞标人完成任务-任务数量统计进行中-1,待验收+1 | 2 | name: ME012-竞标人完成任务-任务数量统计进行中-1,待验收+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/contendTasks_api.yml | 33 | api: api/app_api/task_api/contendTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 领取竞标任务 | 42 | - name: 领取竞标任务 |
44 | variables: | 43 | variables: |
@@ -60,7 +59,7 @@ teststeps: | @@ -60,7 +59,7 @@ teststeps: | ||
60 | validate: | 59 | validate: |
61 | - eq: | 60 | - eq: |
62 | - content.data.tasks.0.title | 61 | - content.data.tasks.0.title |
63 | - - $title | 62 | + - $tasks_title |
64 | - eq: | 63 | - eq: |
65 | - content.data.tasks.0.id | 64 | - content.data.tasks.0.id |
66 | - $tasks_id | 65 | - $tasks_id |
@@ -77,7 +76,7 @@ teststeps: | @@ -77,7 +76,7 @@ teststeps: | ||
77 | - 获取详情成功 | 76 | - 获取详情成功 |
78 | - eq: | 77 | - eq: |
79 | - content.data.task.title | 78 | - content.data.task.title |
80 | - - $title | 79 | + - $tasks_title |
81 | 80 | ||
82 | - name: 竞标人中标确认 | 81 | - name: 竞标人中标确认 |
83 | variables: | 82 | variables: |
1 | config: | 1 | config: |
2 | name: ME013-发布指派任务-任务数量统计进行中-1,待验收+1 | 2 | name: ME013-发布指派任务-任务数量统计进行中-1,待验收+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '指派任务标题${get_nowtime()}' | ||
6 | - content: '指派任务内容${get_nowtime()}' | ||
7 | - acceptability: '指派任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -21,6 +16,9 @@ teststeps: | @@ -21,6 +16,9 @@ teststeps: | ||
21 | plannedFinishDate: ${get_endtime()} | 16 | plannedFinishDate: ${get_endtime()} |
22 | uid: 3284714710070272 | 17 | uid: 3284714710070272 |
23 | uname: '价值系统账号1' | 18 | uname: '价值系统账号1' |
19 | + title: '指派任务标题${get_nowtime()}' | ||
20 | + content: '指派任务内容${get_nowtime()}' | ||
21 | + acceptability: '指派任务验收标准${get_nowtime()}' | ||
24 | api: api/app_api/task_api/taskPublish_api.yml | 22 | api: api/app_api/task_api/taskPublish_api.yml |
25 | 23 | ||
26 | - name: 第一次查看我发布的 | 24 | - name: 第一次查看我发布的 |
@@ -44,10 +42,11 @@ teststeps: | @@ -44,10 +42,11 @@ teststeps: | ||
44 | api: api/app_api/task_api/AssignMeTasks_api.yml | 42 | api: api/app_api/task_api/AssignMeTasks_api.yml |
45 | extract: | 43 | extract: |
46 | - tasks_id: content.data.tasks.0.id | 44 | - tasks_id: content.data.tasks.0.id |
47 | - validate: | ||
48 | - - eq: | ||
49 | - - content.data.tasks.0.title | ||
50 | - - $title | 45 | + - tasks_title: content.data.tasks.0.title |
46 | +# validate: | ||
47 | +# - eq: | ||
48 | +# - content.data.tasks.0.title | ||
49 | +# - $title | ||
51 | 50 | ||
52 | - name: 完成任务 | 51 | - name: 完成任务 |
53 | variables: | 52 | variables: |
1 | config: | 1 | config: |
2 | name: ME014-抢单任务验收成功-任务数量统计待验收-1,完成+1 | 2 | name: ME014-抢单任务验收成功-任务数量统计待验收-1,完成+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -17,6 +12,9 @@ teststeps: | @@ -17,6 +12,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 12 | - name: 发布抢单任务 |
18 | variables: | 13 | variables: |
19 | action: 1 | 14 | action: 1 |
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 18 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 19 | ||
22 | 20 | ||
@@ -32,10 +30,11 @@ teststeps: | @@ -32,10 +30,11 @@ teststeps: | ||
32 | api: api/app_api/task_api/contendTasks_api.yml | 30 | api: api/app_api/task_api/contendTasks_api.yml |
33 | extract: | 31 | extract: |
34 | - tasks_id: content.data.tasks.0.id | 32 | - tasks_id: content.data.tasks.0.id |
35 | - validate: | ||
36 | - - eq: | ||
37 | - - content.data.tasks.0.title | ||
38 | - - $title | 33 | + - tasks_title: content.data.tasks.0.title |
34 | +# validate: | ||
35 | +# - eq: | ||
36 | +# - content.data.tasks.0.title | ||
37 | +# - $title | ||
39 | 38 | ||
40 | - name: 领取任务 | 39 | - name: 领取任务 |
41 | variables: | 40 | variables: |
@@ -56,7 +55,7 @@ teststeps: | @@ -56,7 +55,7 @@ teststeps: | ||
56 | validate: | 55 | validate: |
57 | - eq: | 56 | - eq: |
58 | - content.data.tasks.0.title | 57 | - content.data.tasks.0.title |
59 | - - $title | 58 | + - $tasks_title |
60 | - eq: | 59 | - eq: |
61 | - content.data.tasks.0.id | 60 | - content.data.tasks.0.id |
62 | - $tasks_id | 61 | - $tasks_id |
1 | config: | 1 | config: |
2 | name: ME015-竞标任务验收成功-任务数量统计待验收-1,完成+1 | 2 | name: ME015-竞标任务验收成功-任务数量统计待验收-1,完成+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/contendTasks_api.yml | 33 | api: api/app_api/task_api/contendTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 领取竞标任务 | 42 | - name: 领取竞标任务 |
44 | variables: | 43 | variables: |
@@ -60,7 +59,7 @@ teststeps: | @@ -60,7 +59,7 @@ teststeps: | ||
60 | validate: | 59 | validate: |
61 | - eq: | 60 | - eq: |
62 | - content.data.tasks.0.title | 61 | - content.data.tasks.0.title |
63 | - - $title | 62 | + - $tasks_title |
64 | - eq: | 63 | - eq: |
65 | - content.data.tasks.0.id | 64 | - content.data.tasks.0.id |
66 | - $tasks_id | 65 | - $tasks_id |
@@ -77,7 +76,7 @@ teststeps: | @@ -77,7 +76,7 @@ teststeps: | ||
77 | - 获取详情成功 | 76 | - 获取详情成功 |
78 | - eq: | 77 | - eq: |
79 | - content.data.task.title | 78 | - content.data.task.title |
80 | - - $title | 79 | + - $tasks_title |
81 | 80 | ||
82 | - name: 竞标人中标确认 | 81 | - name: 竞标人中标确认 |
83 | variables: | 82 | variables: |
1 | config: | 1 | config: |
2 | name: ME016-指派任务验收完成-任务数量统计待验收-1,已完成+1 | 2 | name: ME016-指派任务验收完成-任务数量统计待验收-1,已完成+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '指派任务标题${get_nowtime()}' | ||
6 | - content: '指派任务内容${get_nowtime()}' | ||
7 | - acceptability: '指派任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -21,6 +16,9 @@ teststeps: | @@ -21,6 +16,9 @@ teststeps: | ||
21 | plannedFinishDate: ${get_endtime()} | 16 | plannedFinishDate: ${get_endtime()} |
22 | uid: 3284714710070272 | 17 | uid: 3284714710070272 |
23 | uname: '价值系统账号1' | 18 | uname: '价值系统账号1' |
19 | + title: '指派任务标题${get_nowtime()}' | ||
20 | + content: '指派任务内容${get_nowtime()}' | ||
21 | + acceptability: '指派任务验收标准${get_nowtime()}' | ||
24 | api: api/app_api/task_api/taskPublish_api.yml | 22 | api: api/app_api/task_api/taskPublish_api.yml |
25 | 23 | ||
26 | 24 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/AssignMeTasks_api.yml | 33 | api: api/app_api/task_api/AssignMeTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 完成任务 | 42 | - name: 完成任务 |
44 | variables: | 43 | variables: |
1 | config: | 1 | config: |
2 | name: ME017-领取抢单任务-我领取的数量正确 | 2 | name: ME017-领取抢单任务-我领取的数量正确 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -17,6 +12,9 @@ teststeps: | @@ -17,6 +12,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 12 | - name: 发布抢单任务 |
18 | variables: | 13 | variables: |
19 | action: 1 | 14 | action: 1 |
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 18 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 19 | ||
22 | 20 | ||
@@ -40,10 +38,11 @@ teststeps: | @@ -40,10 +38,11 @@ teststeps: | ||
40 | api: api/app_api/task_api/contendTasks_api.yml | 38 | api: api/app_api/task_api/contendTasks_api.yml |
41 | extract: | 39 | extract: |
42 | - tasks_id: content.data.tasks.0.id | 40 | - tasks_id: content.data.tasks.0.id |
43 | - validate: | ||
44 | - - eq: | ||
45 | - - content.data.tasks.0.title | ||
46 | - - $title | 41 | + - tasks_title: content.data.tasks.0.title |
42 | +# validate: | ||
43 | +# - eq: | ||
44 | +# - content.data.tasks.0.title | ||
45 | +# - $title | ||
47 | 46 | ||
48 | - name: 领取任务 | 47 | - name: 领取任务 |
49 | variables: | 48 | variables: |
@@ -80,7 +79,7 @@ teststeps: | @@ -80,7 +79,7 @@ teststeps: | ||
80 | validate: | 79 | validate: |
81 | - eq: | 80 | - eq: |
82 | - content.data.tasks.0.title | 81 | - content.data.tasks.0.title |
83 | - - $title | 82 | + - $tasks_title |
84 | - eq: | 83 | - eq: |
85 | - content.data.tasks.0.id | 84 | - content.data.tasks.0.id |
86 | - $tasks_id | 85 | - $tasks_id |
1 | config: | 1 | config: |
2 | name: ME018-领取竞标任务-我领取的、我参与的数量正确 | 2 | name: ME018-领取竞标任务-我领取的、我参与的数量正确 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -45,10 +43,11 @@ teststeps: | @@ -45,10 +43,11 @@ teststeps: | ||
45 | api: api/app_api/task_api/contendTasks_api.yml | 43 | api: api/app_api/task_api/contendTasks_api.yml |
46 | extract: | 44 | extract: |
47 | - tasks_id: content.data.tasks.0.id | 45 | - tasks_id: content.data.tasks.0.id |
48 | - validate: | ||
49 | - - eq: | ||
50 | - - content.data.tasks.0.title | ||
51 | - - $title | 46 | + - tasks_title: content.data.tasks.0.title |
47 | +# validate: | ||
48 | +# - eq: | ||
49 | +# - content.data.tasks.0.title | ||
50 | +# - $title | ||
52 | 51 | ||
53 | - name: 领取竞标任务 | 52 | - name: 领取竞标任务 |
54 | variables: | 53 | variables: |
@@ -91,7 +90,7 @@ teststeps: | @@ -91,7 +90,7 @@ teststeps: | ||
91 | validate: | 90 | validate: |
92 | - eq: | 91 | - eq: |
93 | - content.data.tasks.0.title | 92 | - content.data.tasks.0.title |
94 | - - $title | 93 | + - $tasks_title |
95 | - eq: | 94 | - eq: |
96 | - content.data.tasks.0.id | 95 | - content.data.tasks.0.id |
97 | - $tasks_id | 96 | - $tasks_id |
@@ -108,7 +107,7 @@ teststeps: | @@ -108,7 +107,7 @@ teststeps: | ||
108 | - 获取详情成功 | 107 | - 获取详情成功 |
109 | - eq: | 108 | - eq: |
110 | - content.data.task.title | 109 | - content.data.task.title |
111 | - - $title | 110 | + - $tasks_title |
112 | 111 | ||
113 | - name: 竞标人中标确认 | 112 | - name: 竞标人中标确认 |
114 | variables: | 113 | variables: |
1 | config: | 1 | config: |
2 | name: ME019-竞标任务-参与人的“我参与的-已完成”数量校验 | 2 | name: ME019-竞标任务-参与人的“我参与的-已完成”数量校验 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/contendTasks_api.yml | 33 | api: api/app_api/task_api/contendTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 领取竞标任务 | 42 | - name: 领取竞标任务 |
44 | variables: | 43 | variables: |
@@ -60,7 +59,7 @@ teststeps: | @@ -60,7 +59,7 @@ teststeps: | ||
60 | validate: | 59 | validate: |
61 | - eq: | 60 | - eq: |
62 | - content.data.tasks.0.title | 61 | - content.data.tasks.0.title |
63 | - - $title | 62 | + - $tasks_title |
64 | - eq: | 63 | - eq: |
65 | - content.data.tasks.0.id | 64 | - content.data.tasks.0.id |
66 | - $tasks_id | 65 | - $tasks_id |
@@ -77,7 +76,7 @@ teststeps: | @@ -77,7 +76,7 @@ teststeps: | ||
77 | - 获取详情成功 | 76 | - 获取详情成功 |
78 | - eq: | 77 | - eq: |
79 | - content.data.task.title | 78 | - content.data.task.title |
80 | - - $title | 79 | + - $tasks_title |
81 | 80 | ||
82 | - name: 竞标人中标确认 | 81 | - name: 竞标人中标确认 |
83 | variables: | 82 | variables: |
1 | config: | 1 | config: |
2 | name: ME020-指派我的-任务数量统计校验 | 2 | name: ME020-指派我的-任务数量统计校验 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '指派任务标题${get_nowtime()}' | ||
6 | - content: '指派任务内容${get_nowtime()}' | ||
7 | - acceptability: '指派任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -38,6 +33,9 @@ teststeps: | @@ -38,6 +33,9 @@ teststeps: | ||
38 | plannedFinishDate: ${get_endtime()} | 33 | plannedFinishDate: ${get_endtime()} |
39 | uid: 3284714710070272 | 34 | uid: 3284714710070272 |
40 | uname: '价值系统账号1' | 35 | uname: '价值系统账号1' |
36 | + title: '指派任务标题${get_nowtime()}' | ||
37 | + content: '指派任务内容${get_nowtime()}' | ||
38 | + acceptability: '指派任务验收标准${get_nowtime()}' | ||
41 | api: api/app_api/task_api/taskPublish_api.yml | 39 | api: api/app_api/task_api/taskPublish_api.yml |
42 | 40 | ||
43 | - name: $phone 登录系统 | 41 | - name: $phone 登录系统 |
@@ -76,10 +74,11 @@ teststeps: | @@ -76,10 +74,11 @@ teststeps: | ||
76 | api: api/app_api/task_api/AssignMeTasks_api.yml | 74 | api: api/app_api/task_api/AssignMeTasks_api.yml |
77 | extract: | 75 | extract: |
78 | - tasks_id: content.data.tasks.0.id | 76 | - tasks_id: content.data.tasks.0.id |
79 | - validate: | ||
80 | - - eq: | ||
81 | - - content.data.tasks.0.title | ||
82 | - - $title | 77 | + - tasks_title: content.data.tasks.0.title |
78 | +# validate: | ||
79 | +# - eq: | ||
80 | +# - content.data.tasks.0.title | ||
81 | +# - $title | ||
83 | 82 | ||
84 | - name: 完成任务 | 83 | - name: 完成任务 |
85 | variables: | 84 | variables: |
1 | config: | 1 | config: |
2 | name: ME021-抢单任务驳回后-我领取的-待确认-1 | 2 | name: ME021-抢单任务驳回后-我领取的-待确认-1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -17,6 +12,9 @@ teststeps: | @@ -17,6 +12,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 12 | - name: 发布抢单任务 |
18 | variables: | 13 | variables: |
19 | action: 1 | 14 | action: 1 |
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 18 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 19 | ||
22 | 20 | ||
@@ -32,10 +30,11 @@ teststeps: | @@ -32,10 +30,11 @@ teststeps: | ||
32 | api: api/app_api/task_api/contendTasks_api.yml | 30 | api: api/app_api/task_api/contendTasks_api.yml |
33 | extract: | 31 | extract: |
34 | - tasks_id: content.data.tasks.0.id | 32 | - tasks_id: content.data.tasks.0.id |
35 | - validate: | ||
36 | - - eq: | ||
37 | - - content.data.tasks.0.title | ||
38 | - - $title | 33 | + - tasks_title: content.data.tasks.0.title |
34 | +# validate: | ||
35 | +# - eq: | ||
36 | +# - content.data.tasks.0.title | ||
37 | +# - $title | ||
39 | 38 | ||
40 | - name: 领取任务 | 39 | - name: 领取任务 |
41 | variables: | 40 | variables: |
@@ -63,7 +62,7 @@ teststeps: | @@ -63,7 +62,7 @@ teststeps: | ||
63 | validate: | 62 | validate: |
64 | - eq: | 63 | - eq: |
65 | - content.data.tasks.0.title | 64 | - content.data.tasks.0.title |
66 | - - $title | 65 | + - $tasks_title |
67 | - eq: | 66 | - eq: |
68 | - content.data.tasks.0.id | 67 | - content.data.tasks.0.id |
69 | - $tasks_id | 68 | - $tasks_id |
1 | config: | 1 | config: |
2 | name: ME022-抢单任务驳回后-我发布的-待确认-1,待领取+1 | 2 | name: ME022-抢单任务驳回后-我发布的-待确认-1,待领取+1 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单任务标题${get_nowtime()}' | ||
6 | - content: '抢单任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -17,6 +12,9 @@ teststeps: | @@ -17,6 +12,9 @@ teststeps: | ||
17 | - name: 发布抢单任务 | 12 | - name: 发布抢单任务 |
18 | variables: | 13 | variables: |
19 | action: 1 | 14 | action: 1 |
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 18 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 19 | ||
22 | 20 | ||
@@ -32,10 +30,11 @@ teststeps: | @@ -32,10 +30,11 @@ teststeps: | ||
32 | api: api/app_api/task_api/contendTasks_api.yml | 30 | api: api/app_api/task_api/contendTasks_api.yml |
33 | extract: | 31 | extract: |
34 | - tasks_id: content.data.tasks.0.id | 32 | - tasks_id: content.data.tasks.0.id |
35 | - validate: | ||
36 | - - eq: | ||
37 | - - content.data.tasks.0.title | ||
38 | - - $title | 33 | + - tasks_title: content.data.tasks.0.title |
34 | +# validate: | ||
35 | +# - eq: | ||
36 | +# - content.data.tasks.0.title | ||
37 | +# - $title | ||
39 | 38 | ||
40 | - name: 领取任务 | 39 | - name: 领取任务 |
41 | variables: | 40 | variables: |
@@ -65,7 +64,7 @@ teststeps: | @@ -65,7 +64,7 @@ teststeps: | ||
65 | validate: | 64 | validate: |
66 | - eq: | 65 | - eq: |
67 | - content.data.tasks.0.title | 66 | - content.data.tasks.0.title |
68 | - - $title | 67 | + - $tasks_title |
69 | - eq: | 68 | - eq: |
70 | - content.data.tasks.0.id | 69 | - content.data.tasks.0.id |
71 | - $tasks_id | 70 | - $tasks_id |
1 | config: | 1 | config: |
2 | name: ME023-竞标任务驳回后-我发布的统计校验 | 2 | name: ME023-竞标任务驳回后-我发布的统计校验 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/contendTasks_api.yml | 33 | api: api/app_api/task_api/contendTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 领取竞标任务 | 42 | - name: 领取竞标任务 |
44 | variables: | 43 | variables: |
@@ -60,7 +59,7 @@ teststeps: | @@ -60,7 +59,7 @@ teststeps: | ||
60 | validate: | 59 | validate: |
61 | - eq: | 60 | - eq: |
62 | - content.data.tasks.0.title | 61 | - content.data.tasks.0.title |
63 | - - $title | 62 | + - $tasks_title |
64 | - eq: | 63 | - eq: |
65 | - content.data.tasks.0.id | 64 | - content.data.tasks.0.id |
66 | - $tasks_id | 65 | - $tasks_id |
@@ -77,7 +76,7 @@ teststeps: | @@ -77,7 +76,7 @@ teststeps: | ||
77 | - 获取详情成功 | 76 | - 获取详情成功 |
78 | - eq: | 77 | - eq: |
79 | - content.data.task.title | 78 | - content.data.task.title |
80 | - - $title | 79 | + - $tasks_title |
81 | 80 | ||
82 | - name: 竞标人中标确认 | 81 | - name: 竞标人中标确认 |
83 | variables: | 82 | variables: |
1 | config: | 1 | config: |
2 | name: ME024-竞标任务被驳回-我领取的、我参与的统计校验 | 2 | name: ME024-竞标任务被驳回-我领取的、我参与的统计校验 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标任务标题${get_nowtime()}' | ||
6 | - content: '竞标任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标任务验收标准${get_nowtime()}' | ||
8 | - | ||
9 | 4 | ||
10 | teststeps: | 5 | teststeps: |
11 | 6 | ||
@@ -20,6 +15,9 @@ teststeps: | @@ -20,6 +15,9 @@ teststeps: | ||
20 | type: 1 | 15 | type: 1 |
21 | bidStartTime: ${get_starttime()} | 16 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 17 | bidEndTime: ${get_endtime()} |
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 22 | ||
25 | 23 | ||
@@ -35,10 +33,11 @@ teststeps: | @@ -35,10 +33,11 @@ teststeps: | ||
35 | api: api/app_api/task_api/contendTasks_api.yml | 33 | api: api/app_api/task_api/contendTasks_api.yml |
36 | extract: | 34 | extract: |
37 | - tasks_id: content.data.tasks.0.id | 35 | - tasks_id: content.data.tasks.0.id |
38 | - validate: | ||
39 | - - eq: | ||
40 | - - content.data.tasks.0.title | ||
41 | - - $title | 36 | + - tasks_title: content.data.tasks.0.title |
37 | +# validate: | ||
38 | +# - eq: | ||
39 | +# - content.data.tasks.0.title | ||
40 | +# - $title | ||
42 | 41 | ||
43 | - name: 领取竞标任务 | 42 | - name: 领取竞标任务 |
44 | variables: | 43 | variables: |
@@ -60,7 +59,7 @@ teststeps: | @@ -60,7 +59,7 @@ teststeps: | ||
60 | validate: | 59 | validate: |
61 | - eq: | 60 | - eq: |
62 | - content.data.tasks.0.title | 61 | - content.data.tasks.0.title |
63 | - - $title | 62 | + - $tasks_title |
64 | - eq: | 63 | - eq: |
65 | - content.data.tasks.0.id | 64 | - content.data.tasks.0.id |
66 | - $tasks_id | 65 | - $tasks_id |
@@ -77,7 +76,7 @@ teststeps: | @@ -77,7 +76,7 @@ teststeps: | ||
77 | - 获取详情成功 | 76 | - 获取详情成功 |
78 | - eq: | 77 | - eq: |
79 | - content.data.task.title | 78 | - content.data.task.title |
80 | - - $title | 79 | + - $tasks_title |
81 | 80 | ||
82 | - name: 竞标人中标确认 | 81 | - name: 竞标人中标确认 |
83 | variables: | 82 | variables: |
1 | +config: | ||
2 | + name: ME025-抢单任务验收成功-任务领取人和参与人当前素币、贡献值数据正确 | ||
3 | + base_url: ${ENV(base_url)} | ||
4 | + | ||
5 | +teststeps: | ||
6 | + | ||
7 | +- name: $phone 登录系统 | ||
8 | + variables: | ||
9 | + phone: ${ENV(phone2)} | ||
10 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
11 | + | ||
12 | +- name: 发布抢单任务 | ||
13 | + variables: | ||
14 | + action: 1 | ||
15 | + title: '抢单任务标题${get_nowtime()}' | ||
16 | + content: '抢单任务内容${get_nowtime()}' | ||
17 | + acceptability: '抢单任务验收标准${get_nowtime()}' | ||
18 | + api: api/app_api/task_api/taskPublish_api.yml | ||
19 | + | ||
20 | +- name: $phone 登录系统 | ||
21 | + variables: | ||
22 | + phone: ${ENV(phone3)} | ||
23 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
24 | + | ||
25 | +- name: 任务参与人第一次查看当前素币 | ||
26 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
27 | + extract: | ||
28 | + - cyr_suMoney: content.data.taskMsg.suMoney | ||
29 | + - cyr_winShares: content.data.taskMsg.winShares | ||
30 | + | ||
31 | + | ||
32 | +- name: $phone 登录系统 | ||
33 | + variables: | ||
34 | + phone: ${ENV(phone1)} | ||
35 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
36 | + | ||
37 | +- name: 任务领取人第一次查看当前素币 | ||
38 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
39 | + extract: | ||
40 | + - lqr_suMoney: content.data.taskMsg.suMoney | ||
41 | + - lqr_winShares: content.data.taskMsg.winShares | ||
42 | + | ||
43 | +- name: 查看抢单任务列表 | ||
44 | + variables: | ||
45 | + action: 0 | ||
46 | + newest: 1 | ||
47 | + api: api/app_api/task_api/contendTasks_api.yml | ||
48 | + extract: | ||
49 | + - tasks_id: content.data.tasks.0.id | ||
50 | + - tasks_title: content.data.tasks.0.title | ||
51 | +# validate: | ||
52 | +# - eq: | ||
53 | +# - content.data.tasks.0.title | ||
54 | +# - $title | ||
55 | + | ||
56 | +- name: 领取任务 | ||
57 | + variables: | ||
58 | + action: 0 | ||
59 | + id: $tasks_id | ||
60 | + api: api/app_api/task_api/submitCompete_api.yml | ||
61 | + | ||
62 | + | ||
63 | +- name: $phone 登录系统 | ||
64 | + variables: | ||
65 | + phone: ${ENV(phone2)} | ||
66 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
67 | + | ||
68 | +- name: 查看我发布的-待确认 | ||
69 | + variables: | ||
70 | + action: 5 | ||
71 | + api: api/app_api/task_api/iPublishedTasks_api.yml | ||
72 | + validate: | ||
73 | + - eq: | ||
74 | + - content.data.tasks.0.title | ||
75 | + - $tasks_title | ||
76 | + - eq: | ||
77 | + - content.data.tasks.0.id | ||
78 | + - $tasks_id | ||
79 | + | ||
80 | +- name: 确认领取人 | ||
81 | + variables: | ||
82 | + taskId: $tasks_id | ||
83 | + planDate: ${get_endtime()} | ||
84 | + api: api/app_api/task_api/verifyReceiver_api.yml | ||
85 | + validate: | ||
86 | + - eq: | ||
87 | + - content.msg | ||
88 | + - 确认成功 | ||
89 | + | ||
90 | +- name: $phone 登录系统 | ||
91 | + variables: | ||
92 | + phone: ${ENV(phone1)} | ||
93 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
94 | + | ||
95 | +- name: 完成任务 | ||
96 | + variables: | ||
97 | + id: $tasks_id | ||
98 | + api: api/app_api/task_api/finishTask_api.yml | ||
99 | + validate: | ||
100 | + - eq: | ||
101 | + - content.msg | ||
102 | + - 完成成功 | ||
103 | + | ||
104 | +- name: $phone 登录系统 | ||
105 | + variables: | ||
106 | + phone: ${ENV(phone2)} | ||
107 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
108 | + | ||
109 | + | ||
110 | +- name: 验收任务 | ||
111 | + variables: | ||
112 | + id: $tasks_id | ||
113 | + actualFinishDate: ${get_endtime()} | ||
114 | + api: api/app_api/task_api/checkAccept_api.yml | ||
115 | + validate: | ||
116 | + - eq: | ||
117 | + - content.msg | ||
118 | + - 验收成功 | ||
119 | + | ||
120 | +- name: $phone 登录系统 | ||
121 | + variables: | ||
122 | + phone: ${ENV(phone1)} | ||
123 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
124 | + | ||
125 | +- name: 任务领取人第二次查看当前素币 | ||
126 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
127 | + validate: | ||
128 | + - eq: | ||
129 | + - content.data.taskMsg.suMoney | ||
130 | + - ${add($lqr_suMoney,90)} | ||
131 | + - eq: | ||
132 | + - content.data.taskMsg.winShares | ||
133 | + - ${add($lqr_winShares,90)} | ||
134 | + | ||
135 | +- name: $phone 登录系统 | ||
136 | + variables: | ||
137 | + phone: ${ENV(phone3)} | ||
138 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
139 | + | ||
140 | +- name: 任务参与人第二次查看当前素币 | ||
141 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
142 | + validate: | ||
143 | + - eq: | ||
144 | + - content.data.taskMsg.suMoney | ||
145 | + - ${add($cyr_suMoney,10)} | ||
146 | + - eq: | ||
147 | + - content.data.taskMsg.winShares | ||
148 | + - ${add($cyr_winShares,10)} |
1 | +config: | ||
2 | + name: ME026-竞标任务验收成功-任务领取人和参与人当前素币、贡献值数据正确 | ||
3 | + base_url: ${ENV(base_url)} | ||
4 | + | ||
5 | +teststeps: | ||
6 | + | ||
7 | +- name: $phone 登录系统 | ||
8 | + variables: | ||
9 | + phone: ${ENV(phone2)} | ||
10 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
11 | + | ||
12 | +- name: 发布竞标任务 | ||
13 | + variables: | ||
14 | + action: 1 | ||
15 | + type: 1 | ||
16 | + bidStartTime: ${get_starttime()} | ||
17 | + bidEndTime: ${get_endtime()} | ||
18 | + title: '竞标任务标题${get_nowtime()}' | ||
19 | + content: '竞标任务内容${get_nowtime()}' | ||
20 | + acceptability: '竞标任务验收标准${get_nowtime()}' | ||
21 | + api: api/app_api/task_api/taskPublish_api.yml | ||
22 | + | ||
23 | +- name: $phone 登录系统 | ||
24 | + variables: | ||
25 | + phone: ${ENV(phone3)} | ||
26 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
27 | + | ||
28 | +- name: 任务参与人第一次查看当前素币 | ||
29 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
30 | + extract: | ||
31 | + - cyr_suMoney: content.data.taskMsg.suMoney | ||
32 | + - cyr_winShares: content.data.taskMsg.winShares | ||
33 | + | ||
34 | + | ||
35 | +- name: $phone 登录系统 | ||
36 | + variables: | ||
37 | + phone: ${ENV(phone1)} | ||
38 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
39 | + | ||
40 | +- name: 任务领取人第一次查看当前素币 | ||
41 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
42 | + extract: | ||
43 | + - lqr_suMoney: content.data.taskMsg.suMoney | ||
44 | + - lqr_winShares: content.data.taskMsg.winShares | ||
45 | + | ||
46 | +- name: 查看竞标任务列表 | ||
47 | + variables: | ||
48 | + action: 1 | ||
49 | + newest: 1 | ||
50 | + api: api/app_api/task_api/contendTasks_api.yml | ||
51 | + extract: | ||
52 | + - tasks_id: content.data.tasks.0.id | ||
53 | + - tasks_title: content.data.tasks.0.title | ||
54 | +# validate: | ||
55 | +# - eq: | ||
56 | +# - content.data.tasks.0.title | ||
57 | +# - $title | ||
58 | + | ||
59 | +- name: 领取竞标任务 | ||
60 | + variables: | ||
61 | + action: 1 | ||
62 | + id: $tasks_id | ||
63 | + api: api/app_api/task_api/submitCompete_api.yml | ||
64 | + | ||
65 | + | ||
66 | +- name: $phone 登录系统 | ||
67 | + variables: | ||
68 | + phone: ${ENV(phone2)} | ||
69 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
70 | + | ||
71 | + | ||
72 | +- name: 查看我发布的-待领取 | ||
73 | + variables: | ||
74 | + action: 1 | ||
75 | + api: api/app_api/task_api/iPublishedTasks_api.yml | ||
76 | + validate: | ||
77 | + - eq: | ||
78 | + - content.data.tasks.0.title | ||
79 | + - $tasks_title | ||
80 | + - eq: | ||
81 | + - content.data.tasks.0.id | ||
82 | + - $tasks_id | ||
83 | + | ||
84 | +- name: 查看任务详情 | ||
85 | + variables: | ||
86 | + id: $tasks_id | ||
87 | + api: api/app_api/task_api/taskDetails_api.yml | ||
88 | + extract: | ||
89 | + - bidders: content.data.task.bidders.0.uid | ||
90 | + validate: | ||
91 | + - eq: | ||
92 | + - content.msg | ||
93 | + - 获取详情成功 | ||
94 | + - eq: | ||
95 | + - content.data.task.title | ||
96 | + - $tasks_title | ||
97 | + | ||
98 | +- name: 竞标人中标确认 | ||
99 | + variables: | ||
100 | + id: $tasks_id | ||
101 | + uid: $bidders | ||
102 | + planFinishDate: ${get_endtime()} | ||
103 | + api: api/app_api/task_api/bidTask_api.yml | ||
104 | + validate: | ||
105 | + - eq: | ||
106 | + - content.msg | ||
107 | + - 中标成功 | ||
108 | + | ||
109 | + | ||
110 | +- name: $phone 登录系统 | ||
111 | + variables: | ||
112 | + phone: ${ENV(phone1)} | ||
113 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
114 | + | ||
115 | +- name: 完成任务 | ||
116 | + variables: | ||
117 | + id: $tasks_id | ||
118 | + api: api/app_api/task_api/finishTask_api.yml | ||
119 | + validate: | ||
120 | + - eq: | ||
121 | + - content.msg | ||
122 | + - 完成成功 | ||
123 | + | ||
124 | +- name: $phone 登录系统 | ||
125 | + variables: | ||
126 | + phone: ${ENV(phone2)} | ||
127 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
128 | + | ||
129 | + | ||
130 | +- name: 验收任务 | ||
131 | + variables: | ||
132 | + id: $tasks_id | ||
133 | + actualFinishDate: ${get_endtime()} | ||
134 | + api: api/app_api/task_api/checkAccept_api.yml | ||
135 | + validate: | ||
136 | + - eq: | ||
137 | + - content.msg | ||
138 | + - 验收成功 | ||
139 | + | ||
140 | +- name: $phone 登录系统 | ||
141 | + variables: | ||
142 | + phone: ${ENV(phone1)} | ||
143 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
144 | + | ||
145 | +- name: 任务领取人第二次查看当前素币 | ||
146 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
147 | + validate: | ||
148 | + - eq: | ||
149 | + - content.data.taskMsg.suMoney | ||
150 | + - ${add($lqr_suMoney,90)} | ||
151 | + - eq: | ||
152 | + - content.data.taskMsg.winShares | ||
153 | + - ${add($lqr_winShares,90)} | ||
154 | + | ||
155 | +- name: $phone 登录系统 | ||
156 | + variables: | ||
157 | + phone: ${ENV(phone3)} | ||
158 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
159 | + | ||
160 | +- name: 任务参与人第二次查看当前素币 | ||
161 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
162 | + validate: | ||
163 | + - eq: | ||
164 | + - content.data.taskMsg.suMoney | ||
165 | + - ${add($cyr_suMoney,10)} | ||
166 | + - eq: | ||
167 | + - content.data.taskMsg.winShares | ||
168 | + - ${add($cyr_winShares,10)} |
1 | +config: | ||
2 | + name: ME027-指派任务验收成功-任务领取人和参与人当前素币、贡献值数据正确 | ||
3 | + base_url: ${ENV(base_url)} | ||
4 | + | ||
5 | +teststeps: | ||
6 | + | ||
7 | +- name: $phone 登录系统 | ||
8 | + variables: | ||
9 | + phone: ${ENV(phone2)} | ||
10 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
11 | + | ||
12 | +- name: 发布指派任务 | ||
13 | + variables: | ||
14 | + action: 1 | ||
15 | + type: 2 | ||
16 | + plannedFinishDate: ${get_endtime()} | ||
17 | + uid: 3284714710070272 | ||
18 | + uname: '价值系统账号1' | ||
19 | + title: '指派任务标题${get_nowtime()}' | ||
20 | + content: '指派任务内容${get_nowtime()}' | ||
21 | + acceptability: '指派任务验收标准${get_nowtime()}' | ||
22 | + api: api/app_api/task_api/taskPublish_api.yml | ||
23 | + | ||
24 | +- name: $phone 登录系统 | ||
25 | + variables: | ||
26 | + phone: ${ENV(phone3)} | ||
27 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
28 | + | ||
29 | +- name: 任务参与人第一次查看当前素币 | ||
30 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
31 | + extract: | ||
32 | + - cyr_suMoney: content.data.taskMsg.suMoney | ||
33 | + - cyr_winShares: content.data.taskMsg.winShares | ||
34 | + | ||
35 | + | ||
36 | +- name: $phone 登录系统 | ||
37 | + variables: | ||
38 | + phone: ${ENV(phone1)} | ||
39 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
40 | + | ||
41 | +- name: 任务领取人第一次查看当前素币 | ||
42 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
43 | + extract: | ||
44 | + - lqr_suMoney: content.data.taskMsg.suMoney | ||
45 | + - lqr_winShares: content.data.taskMsg.winShares | ||
46 | + | ||
47 | +- name: 查看指派我的-进行中 | ||
48 | + variables: | ||
49 | + action: 0 | ||
50 | + api: api/app_api/task_api/AssignMeTasks_api.yml | ||
51 | + extract: | ||
52 | + - tasks_id: content.data.tasks.0.id | ||
53 | + - tasks_title: content.data.tasks.0.title | ||
54 | +# validate: | ||
55 | +# - eq: | ||
56 | +# - content.data.tasks.0.title | ||
57 | +# - $title | ||
58 | + | ||
59 | +- name: 完成任务 | ||
60 | + variables: | ||
61 | + id: $tasks_id | ||
62 | + api: api/app_api/task_api/finishTask_api.yml | ||
63 | + validate: | ||
64 | + - eq: | ||
65 | + - content.msg | ||
66 | + - 完成成功 | ||
67 | + | ||
68 | + | ||
69 | +- name: $phone 登录系统 | ||
70 | + variables: | ||
71 | + phone: ${ENV(phone2)} | ||
72 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
73 | + | ||
74 | +- name: 验收任务 | ||
75 | + variables: | ||
76 | + id: $tasks_id | ||
77 | + actualFinishDate: ${get_endtime()} | ||
78 | + api: api/app_api/task_api/checkAccept_api.yml | ||
79 | + validate: | ||
80 | + - eq: | ||
81 | + - content.msg | ||
82 | + - 验收成功 | ||
83 | + | ||
84 | +- name: $phone 登录系统 | ||
85 | + variables: | ||
86 | + phone: ${ENV(phone1)} | ||
87 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
88 | + | ||
89 | +- name: 任务领取人第二次查看当前素币 | ||
90 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
91 | + validate: | ||
92 | + - eq: | ||
93 | + - content.data.taskMsg.suMoney | ||
94 | + - ${add($lqr_suMoney,90)} | ||
95 | + - eq: | ||
96 | + - content.data.taskMsg.winShares | ||
97 | + - ${add($lqr_winShares,90)} | ||
98 | + | ||
99 | +- name: $phone 登录系统 | ||
100 | + variables: | ||
101 | + phone: ${ENV(phone3)} | ||
102 | + testcase: testcases/common/COM001_task_login_testcases.yml | ||
103 | + | ||
104 | +- name: 任务参与人第二次查看当前素币 | ||
105 | + api: api/app_api/taskStatistics_api/taskStatistics_api.yml | ||
106 | + validate: | ||
107 | + - eq: | ||
108 | + - content.data.taskMsg.suMoney | ||
109 | + - ${add($cyr_suMoney,10)} | ||
110 | + - eq: | ||
111 | + - content.data.taskMsg.winShares | ||
112 | + - ${add($cyr_winShares,10)} |
@@ -3,9 +3,7 @@ config: | @@ -3,9 +3,7 @@ config: | ||
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | variables: | 4 | variables: |
5 | phone: ${ENV(phone2)} | 5 | phone: ${ENV(phone2)} |
6 | - title: '抢单悬赏任务标题${get_nowtime()}' | ||
7 | - content: '抢单悬赏任务内容${get_nowtime()}' | ||
8 | - acceptability: '抢单悬赏任务验收标准${get_nowtime()}' | 6 | + |
9 | 7 | ||
10 | teststeps: | 8 | teststeps: |
11 | 9 | ||
@@ -17,11 +15,22 @@ teststeps: | @@ -17,11 +15,22 @@ teststeps: | ||
17 | action: 0 | 15 | action: 0 |
18 | type: 0 | 16 | type: 0 |
19 | isReward: True | 17 | isReward: True |
18 | + title: '抢单悬赏任务标题1' | ||
19 | + content: '抢单悬赏任务内容1' | ||
20 | + acceptability: '抢单悬赏任务验收标准1' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 22 | ||
23 | +#- name: 查看我发布的-待发布 | ||
24 | +# variables: | ||
25 | +# action: 0 | ||
26 | +# type: [0,1,2] | ||
27 | +# api: api/app_api/task_api/iPublishedTasks_api.yml | ||
28 | +# extract: | ||
29 | +# - tasks_title: content.data.tasks.0.title | ||
30 | + | ||
22 | - name: 查看悬赏任务列表 | 31 | - name: 查看悬赏任务列表 |
23 | api: api/app_api/task_api/taskrewards_api.yml | 32 | api: api/app_api/task_api/taskrewards_api.yml |
24 | validate: | 33 | validate: |
25 | - - not_equals: | ||
26 | - - content.data.tasks.0.title | ||
27 | - - $title | 34 | + - length_equals: |
35 | + - content.data.tasks | ||
36 | + - 0 |
@@ -3,9 +3,7 @@ config: | @@ -3,9 +3,7 @@ config: | ||
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | variables: | 4 | variables: |
5 | phone: ${ENV(phone2)} | 5 | phone: ${ENV(phone2)} |
6 | - title: '抢单悬赏任务标题${get_nowtime()}' | ||
7 | - content: '抢单悬赏任务内容${get_nowtime()}' | ||
8 | - acceptability: '抢单悬赏任务验收标准${get_nowtime()}' | 6 | + |
9 | 7 | ||
10 | teststeps: | 8 | teststeps: |
11 | 9 | ||
@@ -17,6 +15,9 @@ teststeps: | @@ -17,6 +15,9 @@ teststeps: | ||
17 | action: 1 | 15 | action: 1 |
18 | type: 0 | 16 | type: 0 |
19 | isReward: True | 17 | isReward: True |
18 | + title: '抢单悬赏任务标题2' | ||
19 | + content: '抢单悬赏任务内容2' | ||
20 | + acceptability: '抢单悬赏任务验收标准2' | ||
20 | api: api/app_api/task_api/taskPublish_api.yml | 21 | api: api/app_api/task_api/taskPublish_api.yml |
21 | 22 | ||
22 | - name: 查看悬赏任务列表 | 23 | - name: 查看悬赏任务列表 |
@@ -24,7 +25,7 @@ teststeps: | @@ -24,7 +25,7 @@ teststeps: | ||
24 | validate: | 25 | validate: |
25 | - equals: | 26 | - equals: |
26 | - content.data.tasks.0.title | 27 | - content.data.tasks.0.title |
27 | - - $title | 28 | + - '抢单悬赏任务标题2' |
28 | - equals: | 29 | - equals: |
29 | - content.data.tasks.0.inBid | 30 | - content.data.tasks.0.inBid |
30 | - 0 | 31 | - 0 |
1 | config: | 1 | config: |
2 | name: RED003-抢单悬赏任务被领取-悬赏任务列表无数据 | 2 | name: RED003-抢单悬赏任务被领取-悬赏任务列表无数据 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '抢单悬赏任务标题${get_nowtime()}' | ||
6 | - content: '抢单悬赏任务内容${get_nowtime()}' | ||
7 | - acceptability: '抢单悬赏任务验收标准${get_nowtime()}' | ||
8 | 4 | ||
9 | teststeps: | 5 | teststeps: |
10 | 6 | ||
@@ -18,6 +14,9 @@ teststeps: | @@ -18,6 +14,9 @@ teststeps: | ||
18 | action: 1 | 14 | action: 1 |
19 | type: 0 | 15 | type: 0 |
20 | isReward: True | 16 | isReward: True |
17 | + title: '抢单悬赏任务标题3' | ||
18 | + content: '抢单悬赏任务内容3' | ||
19 | + acceptability: '抢单悬赏任务验收标准3' | ||
21 | api: api/app_api/task_api/taskPublish_api.yml | 20 | api: api/app_api/task_api/taskPublish_api.yml |
22 | 21 | ||
23 | - name: 查看悬赏任务列表 | 22 | - name: 查看悬赏任务列表 |
@@ -25,7 +24,7 @@ teststeps: | @@ -25,7 +24,7 @@ teststeps: | ||
25 | validate: | 24 | validate: |
26 | - equals: | 25 | - equals: |
27 | - content.data.tasks.0.title | 26 | - content.data.tasks.0.title |
28 | - - $title | 27 | + - '抢单悬赏任务标题3' |
29 | - equals: | 28 | - equals: |
30 | - content.data.tasks.0.inBid | 29 | - content.data.tasks.0.inBid |
31 | - 0 | 30 | - 0 |
@@ -45,7 +44,7 @@ teststeps: | @@ -45,7 +44,7 @@ teststeps: | ||
45 | validate: | 44 | validate: |
46 | - eq: | 45 | - eq: |
47 | - content.data.tasks.0.title | 46 | - content.data.tasks.0.title |
48 | - - $title | 47 | + - '抢单悬赏任务标题3' |
49 | 48 | ||
50 | - name: 领取任务 | 49 | - name: 领取任务 |
51 | variables: | 50 | variables: |
@@ -64,4 +63,4 @@ teststeps: | @@ -64,4 +63,4 @@ teststeps: | ||
64 | validate: | 63 | validate: |
65 | - not_equals: | 64 | - not_equals: |
66 | - content.data.tasks.0.title | 65 | - content.data.tasks.0.title |
67 | - - $title | ||
66 | + - '抢单悬赏任务标题3' |
@@ -3,9 +3,7 @@ config: | @@ -3,9 +3,7 @@ config: | ||
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | variables: | 4 | variables: |
5 | phone: ${ENV(phone2)} | 5 | phone: ${ENV(phone2)} |
6 | - title: '竞标悬赏任务标题${get_nowtime()}' | ||
7 | - content: '竞标悬赏任务内容${get_nowtime()}' | ||
8 | - acceptability: '竞标悬赏任务验收标准${get_nowtime()}' | 6 | + |
9 | 7 | ||
10 | teststeps: | 8 | teststeps: |
11 | 9 | ||
@@ -20,6 +18,9 @@ teststeps: | @@ -20,6 +18,9 @@ teststeps: | ||
20 | bidStartTime: ${get_starttime()} | 18 | bidStartTime: ${get_starttime()} |
21 | bidEndTime: ${get_endtime()} | 19 | bidEndTime: ${get_endtime()} |
22 | isReward: True | 20 | isReward: True |
21 | + title: '竞标悬赏任务标题1' | ||
22 | + content: '竞标悬赏任务内容1' | ||
23 | + acceptability: '竞标悬赏任务验收标准1' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 24 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 25 | ||
25 | - name: 查看悬赏任务列表 | 26 | - name: 查看悬赏任务列表 |
@@ -27,4 +28,4 @@ teststeps: | @@ -27,4 +28,4 @@ teststeps: | ||
27 | validate: | 28 | validate: |
28 | - not_equals: | 29 | - not_equals: |
29 | - content.data.tasks.0.title | 30 | - content.data.tasks.0.title |
30 | - - $title | ||
31 | + - '竞标悬赏任务标题1' |
@@ -3,9 +3,7 @@ config: | @@ -3,9 +3,7 @@ config: | ||
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | variables: | 4 | variables: |
5 | phone: ${ENV(phone2)} | 5 | phone: ${ENV(phone2)} |
6 | - title: '竞标悬赏任务标题${get_nowtime()}' | ||
7 | - content: '竞标悬赏任务内容${get_nowtime()}' | ||
8 | - acceptability: '竞标悬赏任务验收标准${get_nowtime()}' | 6 | + |
9 | 7 | ||
10 | teststeps: | 8 | teststeps: |
11 | 9 | ||
@@ -20,6 +18,9 @@ teststeps: | @@ -20,6 +18,9 @@ teststeps: | ||
20 | bidStartTime: ${get_starttime()} | 18 | bidStartTime: ${get_starttime()} |
21 | bidEndTime: ${get_endtime()} | 19 | bidEndTime: ${get_endtime()} |
22 | isReward: True | 20 | isReward: True |
21 | + title: '竞标悬赏任务标题2' | ||
22 | + content: '竞标悬赏任务内容2' | ||
23 | + acceptability: '竞标悬赏任务验收标准2' | ||
23 | api: api/app_api/task_api/taskPublish_api.yml | 24 | api: api/app_api/task_api/taskPublish_api.yml |
24 | 25 | ||
25 | - name: 查看悬赏任务列表 | 26 | - name: 查看悬赏任务列表 |
@@ -27,7 +28,7 @@ teststeps: | @@ -27,7 +28,7 @@ teststeps: | ||
27 | validate: | 28 | validate: |
28 | - equals: | 29 | - equals: |
29 | - content.data.tasks.0.title | 30 | - content.data.tasks.0.title |
30 | - - $title | 31 | + - '竞标悬赏任务标题2' |
31 | - equals: | 32 | - equals: |
32 | - content.data.tasks.0.inBid | 33 | - content.data.tasks.0.inBid |
33 | - 0 | 34 | - 0 |
1 | config: | 1 | config: |
2 | name: RED006-竞标悬赏任务参与竞标且未确认-悬赏任务列表有数据,参与竞标状态正确 | 2 | name: RED006-竞标悬赏任务参与竞标且未确认-悬赏任务列表有数据,参与竞标状态正确 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标悬赏任务标题${get_nowtime()}' | ||
6 | - content: '竞标悬赏任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标悬赏任务验收标准${get_nowtime()}' | 4 | + |
8 | 5 | ||
9 | teststeps: | 6 | teststeps: |
10 | 7 | ||
@@ -21,6 +18,9 @@ teststeps: | @@ -21,6 +18,9 @@ teststeps: | ||
21 | bidStartTime: ${get_starttime()} | 18 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 19 | bidEndTime: ${get_endtime()} |
23 | isReward: True | 20 | isReward: True |
21 | + title: '竞标悬赏任务标题3' | ||
22 | + content: '竞标悬赏任务内容3' | ||
23 | + acceptability: '竞标悬赏任务验收标准3' | ||
24 | api: api/app_api/task_api/taskPublish_api.yml | 24 | api: api/app_api/task_api/taskPublish_api.yml |
25 | 25 | ||
26 | - name: 查看悬赏任务列表 | 26 | - name: 查看悬赏任务列表 |
@@ -28,7 +28,7 @@ teststeps: | @@ -28,7 +28,7 @@ teststeps: | ||
28 | validate: | 28 | validate: |
29 | - equals: | 29 | - equals: |
30 | - content.data.tasks.0.title | 30 | - content.data.tasks.0.title |
31 | - - $title | 31 | + - '竞标悬赏任务标题3' |
32 | - equals: | 32 | - equals: |
33 | - content.data.tasks.0.inBid | 33 | - content.data.tasks.0.inBid |
34 | - 0 | 34 | - 0 |
@@ -48,7 +48,7 @@ teststeps: | @@ -48,7 +48,7 @@ teststeps: | ||
48 | validate: | 48 | validate: |
49 | - eq: | 49 | - eq: |
50 | - content.data.tasks.0.title | 50 | - content.data.tasks.0.title |
51 | - - $title | 51 | + - '竞标悬赏任务标题3' |
52 | 52 | ||
53 | - name: 领取竞标任务 | 53 | - name: 领取竞标任务 |
54 | variables: | 54 | variables: |
@@ -61,7 +61,7 @@ teststeps: | @@ -61,7 +61,7 @@ teststeps: | ||
61 | validate: | 61 | validate: |
62 | - equals: | 62 | - equals: |
63 | - content.data.tasks.0.title | 63 | - content.data.tasks.0.title |
64 | - - $title | 64 | + - '竞标悬赏任务标题3' |
65 | - equals: | 65 | - equals: |
66 | - content.data.tasks.0.inBid | 66 | - content.data.tasks.0.inBid |
67 | - 1 | 67 | - 1 |
@@ -76,7 +76,7 @@ teststeps: | @@ -76,7 +76,7 @@ teststeps: | ||
76 | validate: | 76 | validate: |
77 | - equals: | 77 | - equals: |
78 | - content.data.tasks.0.title | 78 | - content.data.tasks.0.title |
79 | - - $title | 79 | + - '竞标悬赏任务标题3' |
80 | - equals: | 80 | - equals: |
81 | - content.data.tasks.0.inBid | 81 | - content.data.tasks.0.inBid |
82 | - 0 | 82 | - 0 |
1 | config: | 1 | config: |
2 | name: RED007-竞标悬赏任务参与竞标且确认-悬赏任务列表无数据,参与竞标状态正确 | 2 | name: RED007-竞标悬赏任务参与竞标且确认-悬赏任务列表无数据,参与竞标状态正确 |
3 | base_url: ${ENV(base_url)} | 3 | base_url: ${ENV(base_url)} |
4 | - variables: | ||
5 | - title: '竞标悬赏任务标题${get_nowtime()}' | ||
6 | - content: '竞标悬赏任务内容${get_nowtime()}' | ||
7 | - acceptability: '竞标悬赏任务验收标准${get_nowtime()}' | 4 | + |
8 | 5 | ||
9 | teststeps: | 6 | teststeps: |
10 | 7 | ||
@@ -21,6 +18,9 @@ teststeps: | @@ -21,6 +18,9 @@ teststeps: | ||
21 | bidStartTime: ${get_starttime()} | 18 | bidStartTime: ${get_starttime()} |
22 | bidEndTime: ${get_endtime()} | 19 | bidEndTime: ${get_endtime()} |
23 | isReward: True | 20 | isReward: True |
21 | + title: '竞标悬赏任务标题4' | ||
22 | + content: '竞标悬赏任务内容4' | ||
23 | + acceptability: '竞标悬赏任务验收标准4' | ||
24 | api: api/app_api/task_api/taskPublish_api.yml | 24 | api: api/app_api/task_api/taskPublish_api.yml |
25 | 25 | ||
26 | - name: 查看悬赏任务列表 | 26 | - name: 查看悬赏任务列表 |
@@ -28,7 +28,7 @@ teststeps: | @@ -28,7 +28,7 @@ teststeps: | ||
28 | validate: | 28 | validate: |
29 | - equals: | 29 | - equals: |
30 | - content.data.tasks.0.title | 30 | - content.data.tasks.0.title |
31 | - - $title | 31 | + - '竞标悬赏任务标题4' |
32 | - equals: | 32 | - equals: |
33 | - content.data.tasks.0.inBid | 33 | - content.data.tasks.0.inBid |
34 | - 0 | 34 | - 0 |
@@ -48,7 +48,7 @@ teststeps: | @@ -48,7 +48,7 @@ teststeps: | ||
48 | validate: | 48 | validate: |
49 | - eq: | 49 | - eq: |
50 | - content.data.tasks.0.title | 50 | - content.data.tasks.0.title |
51 | - - $title | 51 | + - '竞标悬赏任务标题4' |
52 | 52 | ||
53 | - name: 领取竞标任务 | 53 | - name: 领取竞标任务 |
54 | variables: | 54 | variables: |
@@ -61,7 +61,7 @@ teststeps: | @@ -61,7 +61,7 @@ teststeps: | ||
61 | validate: | 61 | validate: |
62 | - equals: | 62 | - equals: |
63 | - content.data.tasks.0.title | 63 | - content.data.tasks.0.title |
64 | - - $title | 64 | + - '竞标悬赏任务标题4' |
65 | - equals: | 65 | - equals: |
66 | - content.data.tasks.0.inBid | 66 | - content.data.tasks.0.inBid |
67 | - 1 | 67 | - 1 |
@@ -76,7 +76,7 @@ teststeps: | @@ -76,7 +76,7 @@ teststeps: | ||
76 | validate: | 76 | validate: |
77 | - equals: | 77 | - equals: |
78 | - content.data.tasks.0.title | 78 | - content.data.tasks.0.title |
79 | - - $title | 79 | + - '竞标悬赏任务标题4' |
80 | - equals: | 80 | - equals: |
81 | - content.data.tasks.0.inBid | 81 | - content.data.tasks.0.inBid |
82 | - 0 | 82 | - 0 |
@@ -88,7 +88,7 @@ teststeps: | @@ -88,7 +88,7 @@ teststeps: | ||
88 | validate: | 88 | validate: |
89 | - eq: | 89 | - eq: |
90 | - content.data.tasks.0.title | 90 | - content.data.tasks.0.title |
91 | - - $title | 91 | + - '竞标悬赏任务标题4' |
92 | - eq: | 92 | - eq: |
93 | - content.data.tasks.0.id | 93 | - content.data.tasks.0.id |
94 | - $tasks_id | 94 | - $tasks_id |
@@ -105,7 +105,7 @@ teststeps: | @@ -105,7 +105,7 @@ teststeps: | ||
105 | - 获取详情成功 | 105 | - 获取详情成功 |
106 | - eq: | 106 | - eq: |
107 | - content.data.task.title | 107 | - content.data.task.title |
108 | - - $title | 108 | + - '竞标悬赏任务标题4' |
109 | 109 | ||
110 | - name: 竞标人中标确认 | 110 | - name: 竞标人中标确认 |
111 | variables: | 111 | variables: |
@@ -123,4 +123,4 @@ teststeps: | @@ -123,4 +123,4 @@ teststeps: | ||
123 | validate: | 123 | validate: |
124 | - not_equals: | 124 | - not_equals: |
125 | - content.data.tasks.0.title | 125 | - content.data.tasks.0.title |
126 | - - $title | 126 | + - '竞标悬赏任务标题4' |
1 | config: | 1 | config: |
2 | name: start_testcases | 2 | name: start_testcases |
3 | #清理数据 | 3 | #清理数据 |
4 | - teardown_hooks: | 4 | + setup_hooks: |
5 | - ${setup_hook_clean_db(214)} | 5 | - ${setup_hook_clean_db(214)} |
6 | + teardown_hooks: | ||
7 | + - ${sleep(5)} | ||
8 | + | ||
9 | +teststeps: | ||
10 | +- name: start_testcases | ||
11 | + api: api/app_api/login_api/gettimestamp_api.yml |
@@ -4,8 +4,9 @@ config: | @@ -4,8 +4,9 @@ config: | ||
4 | 4 | ||
5 | testcases: | 5 | testcases: |
6 | 6 | ||
7 | -#- name: start....初始化数据库 | ||
8 | -# testcase: testcases/start_testcases.yml | 7 | +- name: start....初始化数据库 |
8 | + testcase: testcases/start_testcases.yml | ||
9 | + | ||
9 | ##############################################权限测试用例开始################################### | 10 | ##############################################权限测试用例开始################################### |
10 | - name: PF001价值系统-主管理员拥有发布任务权限 | 11 | - name: PF001价值系统-主管理员拥有发布任务权限 |
11 | testcase: testcases/app/userInfo/PF001-admin.yml | 12 | testcase: testcases/app/userInfo/PF001-admin.yml |
@@ -90,6 +91,15 @@ testcases: | @@ -90,6 +91,15 @@ testcases: | ||
90 | - name: ME024-竞标任务被驳回-我领取的、我参与的统计校验 | 91 | - name: ME024-竞标任务被驳回-我领取的、我参与的统计校验 |
91 | testcase: testcases/app/taskStatistics/ME024-taskStatistics-rejectReceiver-iParticipation-iGet-bid.yml | 92 | testcase: testcases/app/taskStatistics/ME024-taskStatistics-rejectReceiver-iParticipation-iGet-bid.yml |
92 | 93 | ||
94 | +- name: ME025-抢单任务验收成功-任务领取人和参与人当前素币、贡献值数据正确 | ||
95 | + testcase: testcases/app/taskStatistics/ME025-taskStatistics-suMoney-winShares-lootCompleted.yml | ||
96 | + | ||
97 | +- name: ME026-竞标任务验收成功-任务领取人和参与人当前素币、贡献值数据正确 | ||
98 | + testcase: testcases/app/taskStatistics/ME026-taskStatistics-suMoney-winShares-bidCompleted.yml | ||
99 | + | ||
100 | +- name: ME027-指派任务验收成功-任务领取人和参与人当前素币、贡献值数据正确 | ||
101 | + testcase: testcases/app/taskStatistics/ME027-taskStatistics-suMoney-winShares-appointCompleted.yml | ||
102 | + | ||
93 | ##############################################个人中心数量统计用例结束################################### | 103 | ##############################################个人中心数量统计用例结束################################### |
94 | 104 | ||
95 | ##############################################悬赏任务列表用例开始################################### | 105 | ##############################################悬赏任务列表用例开始################################### |
-
请 注册 或 登录 后发表评论