|
|
@@ -63,7 +63,7 @@ print ('發送執行項目通知(無預定完成日期) start...')
|
|
|
q1 = "SELECT DISTINCT(ef.exf_id) \
|
|
|
FROM execute_detail ed \
|
|
|
left JOIN execute_form ef ON ed.exf_id=ef.exf_id \
|
|
|
- AND ef.is_close='N' AND ef.is_delete='N' \
|
|
|
+ WHERE ef.is_close='N' AND ef.is_delete='N' \
|
|
|
AND ed.is_delete = 'N' AND ed.is_complete='N' \
|
|
|
AND ed.set_date = '0000-00-00' \
|
|
|
ORDER BY ef.contract_time"
|
|
|
@@ -72,7 +72,7 @@ q1 = "SELECT DISTINCT(ef.exf_id) \
|
|
|
q2 = "SELECT * \
|
|
|
FROM execute_detail ed \
|
|
|
left JOIN execute_form ef ON ed.exf_id=ef.exf_id \
|
|
|
- AND ef.is_close='N' AND ef.is_delete='N' \
|
|
|
+ WHERE ef.is_close='N' AND ef.is_delete='N' \
|
|
|
AND ed.is_delete = 'N' AND ed.is_complete='N' \
|
|
|
AND ed.set_date = '0000-00-00' \
|
|
|
ORDER BY ef.contract_time"
|
|
|
@@ -112,7 +112,7 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
q3 = "SELECT * \
|
|
|
FROM execute_detail ed \
|
|
|
left JOIN execute_form ef ON ed.exf_id=ef.exf_id \
|
|
|
- AND ef.is_close='N' AND ef.is_delete='N' \
|
|
|
+ WHERE ef.is_close='N' AND ef.is_delete='N' \
|
|
|
AND ed.is_delete = 'N' AND ed.is_complete='N' \
|
|
|
AND ed.set_date = '0000-00-00' \
|
|
|
AND ef.exf_id = '" + str(r1['exf_id']) + "' \
|
|
|
@@ -125,33 +125,8 @@ 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'])
|
|
|
|
|
|
- # 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:
|
|
|
- sales_man = ''
|
|
|
-
|
|
|
if idx < 1:
|
|
|
- print ('q3_result_count = ' + q3_result_count) # test
|
|
|
- print ('str(count) = ' + str(count)) # test
|
|
|
- print ('url = ' + url) # 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'>" + 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'>" + 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>"
|
|
|
|
|
|
idx += 1
|
|
|
else:
|
