Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
aic_duty_strategy
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yinxiaoling
aic_duty_strategy
Commits
3a7c2dba
Commit
3a7c2dba
authored
May 13, 2020
by
yinxiaoling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
失败数据调试
parent
4db70c8d
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
5 deletions
+14
-5
StrategySetController.php
app/Http/Controllers/strategy/StrategySetController.php
+4
-3
StrategyService.php
app/Service/StrategyService.php
+10
-2
20200512174322.xlsx
storage/import/20200512174322.xlsx
+0
-0
20200512174409.xlsx
storage/import/20200512174409.xlsx
+0
-0
20200512174529.xlsx
storage/import/20200512174529.xlsx
+0
-0
20200512185101.xlsx
storage/import/20200512185101.xlsx
+0
-0
20200512192329.xlsx
storage/import/20200512192329.xlsx
+0
-0
20200512192650.xlsx
storage/import/20200512192650.xlsx
+0
-0
20200512192952.xlsx
storage/import/20200512192952.xlsx
+0
-0
20200512193627.xlsx
storage/import/20200512193627.xlsx
+0
-0
20200512193819.xlsx
storage/import/20200512193819.xlsx
+0
-0
No files found.
app/Http/Controllers/strategy/StrategySetController.php
View file @
3a7c2dba
...
@@ -33,15 +33,16 @@ class StrategySetController extends Controller
...
@@ -33,15 +33,16 @@ class StrategySetController extends Controller
/* if ($validator->fails()) {
/* if ($validator->fails()) {
return $this->errorWithInfo('表单验证失败', 401);
return $this->errorWithInfo('表单验证失败', 401);
} */
} */
if
(
isset
(
$request
->
all
()[
'upload'
])){
//excel文件上传
$params
=
$request
->
all
();
if
(
isset
(
$params
[
'upload'
])){
//excel文件上传
$excelData
=
$StrategyService
->
validUploadExcel
(
$request
,
'upload'
,
8388608
);
//限制最大上传文件8M
$excelData
=
$StrategyService
->
validUploadExcel
(
$request
,
'upload'
,
8388608
);
//限制最大上传文件8M
if
(
isset
(
$excelData
[
'code'
])){
if
(
isset
(
$excelData
[
'code'
])){
return
$this
->
errorWithInfo
(
$excelData
[
'msg'
],
401
);
return
$this
->
errorWithInfo
(
$excelData
[
'msg'
],
401
);
}
}
//验证excel数据格式及不合格数据原因
//验证excel数据格式及不合格数据原因
$excelDataValid
=
$StrategyService
->
validExcelData
(
$excelData
,
$
request
->
day_type
);
$excelDataValid
=
$StrategyService
->
validExcelData
(
$excelData
,
$
params
[
'day_type'
]
);
}
}
dd
(
$excelData
);
dd
(
$excelData
Valid
);
dd
(
'策略添加'
);
dd
(
'策略添加'
);
}
}
...
...
app/Service/StrategyService.php
View file @
3a7c2dba
...
@@ -90,13 +90,21 @@ class StrategyService
...
@@ -90,13 +90,21 @@ class StrategyService
$failTotal
=
count
(
$failData
);
$failTotal
=
count
(
$failData
);
$successTotal
=
count
(
$data
);
$successTotal
=
count
(
$data
);
$failDataFile
=
''
;
if
(
$failTotal
>
0
){
//把导出错误数据存入excel表格中供下载
if
(
$failTotal
>
0
){
//把导出错误数据存入excel表格中供下载
$failDataTitle
=
[
'姓名'
,
'*手机号码'
,
'值班日期'
,
'失败原因'
];
$failDataTitle
=
[
'姓名'
,
'*手机号码'
,
'值班日期'
,
'失败原因'
];
array_unshift
(
$failData
,
$failDataTitle
);
array_unshift
(
$failData
,
$failDataTitle
);
$failExcelName
=
"导入失败数据_"
.
date
(
'YmdHis'
);
$failExcelName
=
"导入失败数据_"
.
date
(
'YmdHis'
);
$this
->
storeExcelStyle
(
$failExcelName
,
$failData
);
dump
(
$failExcelName
);
$failFile
=
$this
->
storeExcelStyle
(
$failExcelName
,
$failData
,
''
,
'import'
);
$failDataFile
=
storage_path
(
'export'
)
.
'\\'
.
$failExcelName
.
'.xlsx'
;
if
(
$failFile
){
}
else
{
//失败数据写入失败
dd
(
'失败数据写入失败'
);
}
}
}
return
compact
(
'data'
,
'failData'
,
'failTotal'
,
'successTotal'
);
return
compact
(
'data'
,
'failData'
,
'failTotal'
,
'successTotal'
,
'failDataFile'
);
}
}
...
...
storage/import/20200512174322.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512174409.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512174529.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512185101.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512192329.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512192650.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512192952.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512193627.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
storage/import/20200512193819.xlsx
deleted
100644 → 0
View file @
4db70c8d
File deleted
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment