|
|
@@ -66,7 +66,7 @@ q1 = "SELECT DISTINCT(ef.exf_id) \
|
|
|
AND 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, ed.set_date"
|
|
|
+ ORDER BY ef.contract_time"
|
|
|
|
|
|
# 所有執行項(無預定完成日期) (CRM)
|
|
|
q2 = "SELECT * \
|
|
|
@@ -75,7 +75,7 @@ q2 = "SELECT * \
|
|
|
AND 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, ed.set_date"
|
|
|
+ ORDER BY ef.contract_time"
|
|
|
|
|
|
html = """
|
|
|
<!DOCTYPE html>
|
|
|
@@ -102,7 +102,6 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
<th style='width:15%;'>合約到期日</th> \
|
|
|
<th style='width:5%;'>負責業務</th> \
|
|
|
<th style='width:20%;'>執行項</th> \
|
|
|
- <th style='width:15%;'>預定到期日</th> \
|
|
|
</tr>";
|
|
|
|
|
|
count = 1
|
|
|
@@ -116,7 +115,7 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
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']) + "' \
|
|
|
- ORDER BY ef.contract_time, ed.set_date"
|
|
|
+ ORDER BY ef.contract_time"
|
|
|
|
|
|
q3_result_count = str(len(list(db.query(q3)))+1)
|
|
|
|
|
|
@@ -125,15 +124,12 @@ 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'])
|
|
|
|
|
|
- if r3['set_date'] is None:
|
|
|
- r3['set_date'] = '無'
|
|
|
-
|
|
|
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><td>" + str(r3['set_date']) + "</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:
|
|
|
- html += "<tr><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><td>" + str(r3['set_date']) + "</td></tr>"
|
|
|
+ html += "<tr><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td></tr>"
|
|
|
|
|
|
count += 1
|
|
|
|
