|
|
@@ -124,10 +124,10 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
for r3 in db.query(q3):
|
|
|
url = 'https://backstage.hhh.com.tw/admin/home/execute?exf_id=' + str(r3['exf_id'])
|
|
|
|
|
|
- print ('contract_time = ' + r3['contract_time']) # test
|
|
|
-
|
|
|
- if r3['contract_time'] is 'None':
|
|
|
+ if r3['contract_time'] is None:
|
|
|
r3['contract_time'] = '無'
|
|
|
+
|
|
|
+ print ('contract_time = ' + r3['contract_time']) # test
|
|
|
|
|
|
if idx < 1:
|
|
|
html += "<tr><td rowspan='" + q3_result_count + "'>" + str(count) + "</td><td rowspan='" + q3_result_count + "'><a href='" + url + "' target='_blank'>" + r3['num'] + "</a></td><td rowspan='" + q3_result_count + "'>" + r3['company'] + "</td><td rowspan='" + q3_result_count + "'>" + str(r3['contract_time']) + "</td><td rowspan='" + q3_result_count + "'>" + r3['sales_man'] + "</td><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><tr>"
|
