|
|
@@ -66,7 +66,7 @@ q1 = "SELECT DISTINCT(ef.exf_id) \
|
|
|
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"
|
|
|
+ ORDER BY ef.execute_man"
|
|
|
|
|
|
# 所有執行項(無預定完成日期) (CRM)
|
|
|
q2 = "SELECT * \
|
|
|
@@ -75,7 +75,7 @@ q2 = "SELECT * \
|
|
|
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"
|
|
|
+ ORDER BY ef.execute_man"
|
|
|
|
|
|
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"
|
|
|
+ ORDER BY ef.execute_man"
|
|
|
|
|
|
q3_result_count = str(len(list(db.query(q3)))+1)
|
|
|
|
