|
@@ -113,6 +113,7 @@ class Job extends Base { |
|
@@ -113,6 +113,7 @@ class Job extends Base { |
113
|
$limit = app()->request('limit', 20, 'intval');
|
113
|
$limit = app()->request('limit', 20, 'intval');
|
114
|
$jobId = app()->request('id', 0, 'intval');
|
114
|
$jobId = app()->request('id', 0, 'intval');
|
115
|
$status = app()->request('status');
|
115
|
$status = app()->request('status');
|
|
|
116
|
+ $isExport = false;
|
116
|
|
117
|
|
117
|
if (!$jobId) {
|
118
|
if (!$jobId) {
|
118
|
app()->e('send_job_id_null_error');
|
119
|
app()->e('send_job_id_null_error');
|
|
@@ -123,9 +124,12 @@ class Job extends Base { |
|
@@ -123,9 +124,12 @@ class Job extends Base { |
123
|
if ($status || $status === '0') {
|
124
|
if ($status || $status === '0') {
|
124
|
$whereArray['status'] = $status;
|
125
|
$whereArray['status'] = $status;
|
125
|
}
|
126
|
}
|
|
|
127
|
+ if (app()->request('is_export', 0)) {
|
|
|
128
|
+ $isExport = true;
|
|
|
129
|
+ }
|
126
|
$where = dbWhere($whereArray);
|
130
|
$where = dbWhere($whereArray);
|
127
|
|
131
|
|
128
|
- $lists = db()->all(sendJobStatusSql::detail($where, $page, $limit));
|
132
|
+ $lists = db()->all(sendJobStatusSql::detail($where, $page, $limit, $isExport));
|
129
|
|
133
|
|
130
|
return listsPage($lists,
|
134
|
return listsPage($lists,
|
131
|
db()->count(sendJobStatusSql::detailCount($where))
|
135
|
db()->count(sendJobStatusSql::detailCount($where))
|