|
@@ -224,7 +224,7 @@ class TongCe:
|
|
|
b.sub_option_content AS sex
|
|
b.sub_option_content AS sex
|
|
|
FROM
|
|
FROM
|
|
|
f_t_daren_score_2 a
|
|
f_t_daren_score_2 a
|
|
|
- LEFT JOIN d_shangju_tiku_02 b ON a.score = b.sub_option_id
|
|
|
|
|
|
|
+ LEFT JOIN d_shangju_tiku_02 b ON (a.score = b.sub_option_id or a.score = b.score)
|
|
|
WHERE
|
|
WHERE
|
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
|
AND b.father_id = 47
|
|
AND b.father_id = 47
|
|
@@ -240,7 +240,7 @@ class TongCe:
|
|
|
b.sub_option_content AS nld
|
|
b.sub_option_content AS nld
|
|
|
FROM
|
|
FROM
|
|
|
f_t_daren_score_2 a
|
|
f_t_daren_score_2 a
|
|
|
- LEFT JOIN d_shangju_tiku_02 b ON a.score = b.sub_option_id
|
|
|
|
|
|
|
+ LEFT JOIN d_shangju_tiku_02 b ON (a.score = b.sub_option_id or a.score = b.score)
|
|
|
WHERE
|
|
WHERE
|
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
|
AND b.father_id = 48
|
|
AND b.father_id = 48
|
|
@@ -256,7 +256,7 @@ class TongCe:
|
|
|
b.sub_option_content AS zhifuli
|
|
b.sub_option_content AS zhifuli
|
|
|
FROM
|
|
FROM
|
|
|
f_t_daren_score_2 a
|
|
f_t_daren_score_2 a
|
|
|
- LEFT JOIN d_shangju_tiku_02 b ON a.score = b.sub_option_id
|
|
|
|
|
|
|
+ LEFT JOIN d_shangju_tiku_02 b ON (a.score = b.sub_option_id or a.score = b.score)
|
|
|
WHERE
|
|
WHERE
|
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
|
AND b.father_id = 234
|
|
AND b.father_id = 234
|
|
@@ -272,7 +272,7 @@ class TongCe:
|
|
|
b.sub_option_content AS city
|
|
b.sub_option_content AS city
|
|
|
FROM
|
|
FROM
|
|
|
f_t_daren_score_2 a
|
|
f_t_daren_score_2 a
|
|
|
- LEFT JOIN d_shangju_tiku_02 b ON a.score = b.sub_option_id
|
|
|
|
|
|
|
+ LEFT JOIN d_shangju_tiku_02 b ON (a.score = b.sub_option_id or a.score = b.score)
|
|
|
WHERE
|
|
WHERE
|
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
|
AND b.father_id = 254
|
|
AND b.father_id = 254
|
|
@@ -288,7 +288,7 @@ class TongCe:
|
|
|
b.sub_option_content AS juzhujiegou
|
|
b.sub_option_content AS juzhujiegou
|
|
|
FROM
|
|
FROM
|
|
|
f_t_daren_score_2 a
|
|
f_t_daren_score_2 a
|
|
|
- LEFT JOIN d_shangju_tiku_02 b ON a.score = b.sub_option_id
|
|
|
|
|
|
|
+ LEFT JOIN d_shangju_tiku_02 b ON (a.score = b.sub_option_id or a.score = b.score)
|
|
|
WHERE
|
|
WHERE
|
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
a.testcase_id IN (84, 85, 86, 87)
|
|
|
AND b.father_id = 211
|
|
AND b.father_id = 211
|
|
@@ -317,7 +317,6 @@ class TongCe:
|
|
|
a.testcase_id = b.testcase_id
|
|
a.testcase_id = b.testcase_id
|
|
|
AND (a.score = b.sub_option_id or a.score = b.score)
|
|
AND (a.score = b.sub_option_id or a.score = b.score)
|
|
|
AND a.testcase_id IN (84, 85, 86, 87)
|
|
AND a.testcase_id IN (84, 85, 86, 87)
|
|
|
- AND a.sub_question_id = 417
|
|
|
|
|
) m ON x.uuid = m.uuid
|
|
) m ON x.uuid = m.uuid
|
|
|
'''
|
|
'''
|
|
|
|
|
|
|
@@ -485,7 +484,7 @@ class TongCe:
|
|
|
# self.linshi_db.truncate('mvp_page_display_match')
|
|
# self.linshi_db.truncate('mvp_page_display_match')
|
|
|
# self.linshi_db.add_some(self.sql_3, match_data)
|
|
# self.linshi_db.add_some(self.sql_3, match_data)
|
|
|
self.match_data_info = self.get_option_match_info()
|
|
self.match_data_info = self.get_option_match_info()
|
|
|
- # self.linshi_db.truncate('mvp_page_display_data')
|
|
|
|
|
|
|
+ self.linshi_db.truncate('mvp_page_display_data')
|
|
|
|
|
|
|
|
# 筛选写入data的数据
|
|
# 筛选写入data的数据
|
|
|
count = 0
|
|
count = 0
|
|
@@ -538,7 +537,7 @@ class TongCe:
|
|
|
match_id = md[0]
|
|
match_id = md[0]
|
|
|
option_name_alias = md[3]
|
|
option_name_alias = md[3]
|
|
|
isnert_data_all.append([5405, match_id, rule_id, option_name_alias, q_s[2]])
|
|
isnert_data_all.append([5405, match_id, rule_id, option_name_alias, q_s[2]])
|
|
|
- # self.linshi_db.add_some(self.sql_6, isnert_data_all)
|
|
|
|
|
|
|
+ self.linshi_db.add_some(self.sql_6, isnert_data_all)
|
|
|
count += len(isnert_data_all)
|
|
count += len(isnert_data_all)
|
|
|
return {'写入库中的数据': count, '无数据': len(no_data_case)}
|
|
return {'写入库中的数据': count, '无数据': len(no_data_case)}
|
|
|
except Exception as e:
|
|
except Exception as e:
|
