master
elf 3 years ago
parent 1b90124f81
commit e362a27e1d

@ -64,7 +64,7 @@ class PromoteCompanyWarningController extends ThinkController
$joinDataTable = '(' . $tmpTable . ')'; $joinDataTable = '(' . $tmpTable . ')';
} else { } else {
$columns[] = 'b.month'; $columns[] = 'b.month';
$orderBy = 'b.month asc, b.company_id asc'; $orderBy = 'b.month desc, b.company_id asc';
} }
$query = M('promote_company', 'tab_')->alias('c') $query = M('promote_company', 'tab_')->alias('c')
@ -144,8 +144,8 @@ class PromoteCompanyWarningController extends ThinkController
} }
$pageTypeNames = [ $pageTypeNames = [
'monthly' => '当月流水预警', 'monthly' => '合同签订当月流水预警',
'total' => '累计流水预警', 'total' => '合同签订累计流水预警',
]; ];
$pageTypeName = $pageTypeNames[$type]; $pageTypeName = $pageTypeNames[$type];

Loading…
Cancel
Save