Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
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
QG
customer-service
Commits
2dec1289
Commit
2dec1289
authored
Jun 05, 2024
by
yajun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
b58ce219
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
ThirdWorkOrderRest.java
.../java/cn/quantgroup/customer/rest/ThirdWorkOrderRest.java
+3
-6
ThirdWorkOrderServiceImpl.java
...roup/customer/service/impl/ThirdWorkOrderServiceImpl.java
+3
-0
No files found.
src/main/java/cn/quantgroup/customer/rest/ThirdWorkOrderRest.java
View file @
2dec1289
...
@@ -31,13 +31,10 @@ public class ThirdWorkOrderRest {
...
@@ -31,13 +31,10 @@ public class ThirdWorkOrderRest {
}
}
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
public
JsonResult
export
(
@RequestBody
WorkOrderParam
param
,
public
JsonResult
export
(
@RequestBody
WorkOrderParam
param
,
// @RequestHeader("account") String account,
@RequestHeader
(
value
=
"account"
,
required
=
false
,
defaultValue
=
""
)
String
account
,
// @RequestHeader("qg-tenant-id") Integer tenantId
@RequestHeader
(
value
=
"qg-tenant-id"
,
required
=
false
,
defaultValue
=
"560761"
)
Integer
tenantId
HttpServletRequest
request
)
{
)
{
String
account
=
request
.
getHeader
(
"account"
);
return
thirdWorkOrderService
.
export
(
param
,
account
,
tenantId
);
String
tenantId
=
request
.
getHeader
(
"qg-tenant-id"
);
return
thirdWorkOrderService
.
export
(
param
,
account
,
Integer
.
parseInt
(
tenantId
));
}
}
...
...
src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java
View file @
2dec1289
...
@@ -223,6 +223,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
...
@@ -223,6 +223,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
@Override
@Override
public
JsonResult
export
(
WorkOrderParam
param
,
String
account
,
Integer
tenantId
)
{
public
JsonResult
export
(
WorkOrderParam
param
,
String
account
,
Integer
tenantId
)
{
if
(
StringUtils
.
isBlank
(
account
)){
return
JsonResult
.
buildErrorStateResult
(
"账号名为空"
);
}
executorService
.
execute
(()->{
executorService
.
execute
(()->{
doExportBusiness
(
param
,
account
,
tenantId
);
doExportBusiness
(
param
,
account
,
tenantId
);
});
});
...
...
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