Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
3614f803
Commit
3614f803
authored
Jul 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] delete multrequst in financedata import
parent
1faf8aea
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
FinanceDataImportController.java
.../taxtech/atms/controller/FinanceDataImportController.java
+3
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/FinanceDataImportController.java
View file @
3614f803
...
...
@@ -118,7 +118,7 @@ public class FinanceDataImportController {
public
ResponseEntity
FinanceImportData
(
@RequestParam
String
importMethod
,
@RequestParam
String
fileName
,
@RequestParam
String
importType
,
@RequestParam
(
required
=
false
)
String
fileGuid
,
@RequestParam
Integer
period
,
@RequestParam
(
required
=
false
)
String
fileExtension
,
@RequestParam
(
required
=
false
)
String
projectYear
,
MultipartHttpServletRequest
request
)
{
@RequestParam
(
required
=
false
)
String
projectYear
)
{
String
userId
=
identityService
.
getIdentityUser
().
getID
();
if
(
StringUtils
.
isEmpty
(
importMethod
))
{
return
ResponseEntity
.
ok
(
new
OperationResultDto
(
false
,
"importMethod is empty"
));
...
...
@@ -163,8 +163,8 @@ public class FinanceDataImportController {
financeDataImport
.
DeleteErpValidation
();
//3. 开始导入数据
for
(
MultipartFile
f
:
request
.
getFileMap
().
values
()
)
{
String
fileFullPath
=
Paths
.
get
(
mappedPath
,
fileGuid
+
"_"
+
f
.
getName
()
).
toString
();
for
(
String
f
:
fileList
)
{
String
fileFullPath
=
Paths
.
get
(
mappedPath
,
fileGuid
+
"_"
+
f
).
toString
();
String
schemaPath
=
"~/Resource"
;
toDeleteFilesPath
.
add
(
fileFullPath
);
ImportDataDto
importResult
=
financeDataImport
.
ImportData
(
projectYear
,
importMethod
,
importType
,
period
,
fileFullPath
,
f
,
schemaPath
,
userId
);
...
...
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