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
1faf8aea
Commit
1faf8aea
authored
Jul 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] set requre to false for some para in importFinancedata
parent
05e48990
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
FinanceDataImportController.java
.../taxtech/atms/controller/FinanceDataImportController.java
+3
-3
FinanceDataImportServiceImpl.java
...h/atms/vat/service/impl/FinanceDataImportServiceImpl.java
+1
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/FinanceDataImportController.java
View file @
1faf8aea
...
...
@@ -116,9 +116,9 @@ public class FinanceDataImportController {
@RequestMapping
(
value
=
"importData/importFinancedata"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
ResponseEntity
FinanceImportData
(
@RequestParam
String
importMethod
,
@RequestParam
String
fileName
,
@RequestParam
String
importType
,
@RequestParam
String
fileGuid
,
@RequestParam
Integer
period
,
@RequestParam
String
fileExtension
,
@RequestParam
String
projectYear
,
MultipartHttpServletRequest
request
)
{
@RequestParam
String
importType
,
@RequestParam
(
required
=
false
)
String
fileGuid
,
@RequestParam
Integer
period
,
@RequestParam
(
required
=
false
)
String
fileExtension
,
@RequestParam
(
required
=
false
)
String
projectYear
,
MultipartHttpServletRequest
request
)
{
String
userId
=
identityService
.
getIdentityUser
().
getID
();
if
(
StringUtils
.
isEmpty
(
importMethod
))
{
return
ResponseEntity
.
ok
(
new
OperationResultDto
(
false
,
"importMethod is empty"
));
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FinanceDataImportServiceImpl.java
View file @
1faf8aea
...
...
@@ -220,8 +220,8 @@ public class FinanceDataImportServiceImpl {
}
private
String
imageToBase64ByImagePath
(
String
imagPath
,
String
format
)
{
try
(
ByteArrayOutputStream
outputStream
=
new
ByteArrayOutputStream
())
{
logger
.
debug
(
"read image path is {}"
,
imagPath
);
BufferedImage
bufferedImage
=
ImageIO
.
read
(
new
File
(
imagPath
));
ImageIO
.
write
(
bufferedImage
,
format
,
outputStream
);
BASE64Encoder
encoder
=
new
BASE64Encoder
();
...
...
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