|
@@ -380,7 +380,7 @@ export class ShuyouGameTargetService extends BaseService {
|
|
|
a.id,a.task_id,a.task_name,DATE_FORMAT(a.new_date,'%Y-%m-%d') AS new_date,a.target_new,a.target_pay,a.target_active,
|
|
a.id,a.task_id,a.task_name,DATE_FORMAT(a.new_date,'%Y-%m-%d') AS new_date,a.target_new,a.target_pay,a.target_active,
|
|
|
IFNULL(c.complete_new, 0) AS complete_new,IFNULL(c.complete_pay, 0) AS complete_pay,game_rate,game_rate_xmy,
|
|
IFNULL(c.complete_new, 0) AS complete_new,IFNULL(c.complete_pay, 0) AS complete_pay,game_rate,game_rate_xmy,
|
|
|
IFNULL(c.complete_active,0) AS complete_active,c.updateTime,c.is_complete,c.amount,t.xjf_id,
|
|
IFNULL(c.complete_active,0) AS complete_active,c.updateTime,c.is_complete,c.amount,t.xjf_id,
|
|
|
- b.name AS directorName,b.id AS directorId,t.login_modeId AS login_modeId,
|
|
|
|
|
|
|
+ b.name AS directorName,b.id AS directorId,t.login_modeId AS login_modeId,l.name AS login_mode,
|
|
|
d.type_id AS type_id,d.reason AS reason,d.solution AS solution,
|
|
d.type_id AS type_id,d.reason AS reason,d.solution AS solution,
|
|
|
if(a.target_new - complete_new < 0, 0, a.target_new-complete_new) AS incomplete_new,
|
|
if(a.target_new - complete_new < 0, 0, a.target_new-complete_new) AS incomplete_new,
|
|
|
if(a.target_pay - complete_pay < 0, 0, a.target_pay-complete_pay) AS incomplete_pay,
|
|
if(a.target_pay - complete_pay < 0, 0, a.target_pay-complete_pay) AS incomplete_pay,
|
|
@@ -394,6 +394,7 @@ export class ShuyouGameTargetService extends BaseService {
|
|
|
LEFT JOIN shuyou_game_complete c ON a.task_id = c.task_id AND a.new_date = c.new_date
|
|
LEFT JOIN shuyou_game_complete c ON a.task_id = c.task_id AND a.new_date = c.new_date
|
|
|
LEFT JOIN shuyou_game_complete_hand m ON a.task_id = m.task_id AND a.new_date = m.new_date
|
|
LEFT JOIN shuyou_game_complete_hand m ON a.task_id = m.task_id AND a.new_date = m.new_date
|
|
|
LEFT JOIN shuyou_reason_incomplete d ON a.task_id = d.task_id AND a.new_date = d.new_date
|
|
LEFT JOIN shuyou_reason_incomplete d ON a.task_id = d.task_id AND a.new_date = d.new_date
|
|
|
|
|
+ LEFT JOIN shuyou_lo_mode l ON t.login_modeId = l.id
|
|
|
WHERE
|
|
WHERE
|
|
|
1 = 1
|
|
1 = 1
|
|
|
${this.setSql(task_id, 'and a.task_id LIKE ?', [`%${task_id}%`])}
|
|
${this.setSql(task_id, 'and a.task_id LIKE ?', [`%${task_id}%`])}
|