|
|
@@ -125,13 +125,18 @@ 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'])
|
|
|
|
|
|
- contract_time = r3['contract_time']
|
|
|
- if contract_time is None:
|
|
|
- contract_time = '無'
|
|
|
-
|
|
|
+ # NULL資料處理
|
|
|
+ num = r3['num']
|
|
|
+ if r3['num'] is None:
|
|
|
+ num = ''
|
|
|
+
|
|
|
company = r3['company']
|
|
|
if r3['company'] is None:
|
|
|
company = ''
|
|
|
+
|
|
|
+ contract_time = r3['contract_time']
|
|
|
+ if contract_time is None:
|
|
|
+ contract_time = '無'
|
|
|
|
|
|
sales_man = r3['sales_man']
|
|
|
if r3['sales_man'] is None:
|
|
|
@@ -141,12 +146,12 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
print ('q3_result_count = ' + q3_result_count) # test
|
|
|
print ('str(count) = ' + str(count)) # test
|
|
|
print ('url = ' + url) # test
|
|
|
- print ('num = ' + r3['num']) # test
|
|
|
+ print ('num = ' + num) # test
|
|
|
print ('company = ' + company) # test
|
|
|
print ('contract_time = ' + contract_time) # test
|
|
|
print ('sales_man = ' + sales_man) # test
|
|
|
|
|
|
- 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 + "'>" + company + "</td><td rowspan='" + q3_result_count + "'>" + str(contract_time) + "</td><td rowspan='" + q3_result_count + "'>" + sales_man + "</td><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><tr>"
|
|
|
+ html += "<tr><td rowspan='" + q3_result_count + "'>" + str(count) + "</td><td rowspan='" + q3_result_count + "'><a href='" + url + "' target='_blank'>" + num + "</a></td><td rowspan='" + q3_result_count + "'>" + company + "</td><td rowspan='" + q3_result_count + "'>" + str(contract_time) + "</td><td rowspan='" + q3_result_count + "'>" + sales_man + "</td><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><tr>"
|
|
|
|
|
|
idx += 1
|
|
|
else:
|
