Commit 0b16b7b1 authored by yinxiaoling's avatar yinxiaoling

下载失败数据

parent 7d97a651
...@@ -156,7 +156,7 @@ class StrategySetController extends Controller ...@@ -156,7 +156,7 @@ class StrategySetController extends Controller
if (empty($excelFile)){ if (empty($excelFile)){
return $this->errorWithInfo('表单验证失败', 401); return $this->errorWithInfo('表单验证失败', 401);
} }
$url = storage_path()."/import/".$excelFile.'.xlsx'; $url = storage_path()."/import/".$excelFile.'.xlsx';//dump(file_exists($url));dd($url);
try{ try{
if (file_exists($url) == false){ if (file_exists($url) == false){
return $this->errorWithInfo('文件不存在,下载失败', 401); return $this->errorWithInfo('文件不存在,下载失败', 401);
...@@ -166,7 +166,7 @@ class StrategySetController extends Controller ...@@ -166,7 +166,7 @@ class StrategySetController extends Controller
fclose($cont); fclose($cont);
//发送mp3文件MIME 头 //发送mp3文件MIME 头
header('Content-Type:application/vnd.ms-excel'); header('Content-Type:application/vnd.ms-excel;charset=utf-8;');
// 发送下载附件头. // 发送下载附件头.
header("Content-disposition: attachment; filename=\"".$url."\""); header("Content-disposition: attachment; filename=\"".$url."\"");
header('Content-transfer-encoding: binary'); header('Content-transfer-encoding: binary');
......
...@@ -17,9 +17,11 @@ class StrategyTaskController extends Controller ...@@ -17,9 +17,11 @@ class StrategyTaskController extends Controller
public function index(Request $request){ public function index(Request $request){
try{ try{
$pageSize=request()->pageSize; $pageSize = $request->pageSize;
if (empty($pageSize)){
$pageSize = 20;
}
$projectArr = $this->getAllowProjects(1); $projectArr = $this->getAllowProjects(1);
//$strategyInfo = StrategyTask::all()->toArray();
$searchArr = []; $searchArr = [];
/* $searchArr['phone'] = request()->phone; /* $searchArr['phone'] = request()->phone;
...@@ -31,11 +33,9 @@ class StrategyTaskController extends Controller ...@@ -31,11 +33,9 @@ class StrategyTaskController extends Controller
$searchArr['is_created'] = $request->is_created; $searchArr['is_created'] = $request->is_created;
$searchArr['callTimeStart'] = $request->started_at; $searchArr['callTimeStart'] = $request->started_at;
$searchArr['callTimeStop'] = $request->stoped_at; $searchArr['callTimeStop'] = $request->stoped_at;
//Log::channel('api')->info(var_export($searchArr,true));
Log::channel('api')->info(var_export($searchArr,true));
$strategyInfo = StrategyTask::where(function($query) use ($searchArr){ $strategyInfo = StrategyTask::where(function($query) use ($searchArr){
if (isset($searchArr['phone']) && !empty($searchArr['phone'])){ if (isset($searchArr['phone']) && !empty($searchArr['phone'])){
$query->where('phone','like',"%{$searchArr['phone']}%"); $query->where('phone','like',"%{$searchArr['phone']}%");
......
...@@ -104,8 +104,7 @@ class StrategyService ...@@ -104,8 +104,7 @@ class StrategyService
if ($failTotal > 0){//把导出错误数据存入excel表格中供下载 if ($failTotal > 0){//把导出错误数据存入excel表格中供下载
$failDataTitle = ['姓名','*手机号码','值班日期','失败原因']; $failDataTitle = ['姓名','*手机号码','值班日期','失败原因'];
array_unshift($failData, $failDataTitle); array_unshift($failData, $failDataTitle);
$failExcelName = "导入失败数据_".date('YmdHis'); $failExcelName = "importfaildata_".date('YmdHis');
$failFile = $this->storeExcelStyle($failExcelName, $failData,'','import'); $failFile = $this->storeExcelStyle($failExcelName, $failData,'','import');
//$failDataFile = $failExcelName.'.xlsx'; //$failDataFile = $failExcelName.'.xlsx';
if ($failFile){ if ($failFile){
...@@ -130,7 +129,7 @@ class StrategyService ...@@ -130,7 +129,7 @@ class StrategyService
} }
} }
$e = Excel::create(iconv('UTF-8', 'GBK', $excelName),function($excel) use ($datas,$arr){ $e = Excel::create(iconv('UTF-8', 'GB2312', $excelName),function($excel) use ($datas,$arr){
$excel->sheet('score', function($sheet) use ($datas,$arr){ $excel->sheet('score', function($sheet) use ($datas,$arr){
$col =array(); $col =array();
$sheet->rows($datas); $sheet->rows($datas);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment