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
87bbd6dc
Commit
87bbd6dc
authored
Jun 06, 2024
by
yajun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
7d0ed06e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
KdspServiceImpl.java
.../cn/quantgroup/customer/service/impl/KdspServiceImpl.java
+2
-1
ThirdWorkOrderServiceImpl.java
...roup/customer/service/impl/ThirdWorkOrderServiceImpl.java
+6
-6
No files found.
src/main/java/cn/quantgroup/customer/service/impl/KdspServiceImpl.java
View file @
87bbd6dc
...
@@ -10,6 +10,7 @@ import cn.quantgroup.customer.service.IKdspService;
...
@@ -10,6 +10,7 @@ import cn.quantgroup.customer.service.IKdspService;
import
cn.quantgroup.customer.service.http.IHttpService
;
import
cn.quantgroup.customer.service.http.IHttpService
;
import
cn.quantgroup.customer.util.JSONTools
;
import
cn.quantgroup.customer.util.JSONTools
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -39,7 +40,7 @@ public class KdspServiceImpl implements IKdspService {
...
@@ -39,7 +40,7 @@ public class KdspServiceImpl implements IKdspService {
List
<
String
>
orderNos
,
Integer
tenantId
)
{
List
<
String
>
orderNos
,
Integer
tenantId
)
{
if
(
CollectionUtils
.
isEmpty
(
orderNos
)){
if
(
CollectionUtils
.
isEmpty
(
orderNos
)){
return
JsonResult
.
buildSuccessResult
(
""
,
""
);
return
JsonResult
.
buildSuccessResult
(
""
,
new
ArrayList
<>()
);
}
}
String
url
=
kdspOperationUrl
+
"/api/kdsp/op/order/getOrderDetailForWorkOder"
;
String
url
=
kdspOperationUrl
+
"/api/kdsp/op/order/getOrderDetailForWorkOder"
;
JsonResult
<
List
<
ThirdWorkOrderExportVo
>>
jsonResult
=
null
;
JsonResult
<
List
<
ThirdWorkOrderExportVo
>>
jsonResult
=
null
;
...
...
src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java
View file @
87bbd6dc
...
@@ -345,9 +345,11 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
...
@@ -345,9 +345,11 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
for
(
int
i
=
0
;
i
<
orderPageNo
;
i
++){
for
(
int
i
=
0
;
i
<
orderPageNo
;
i
++){
List
<
String
>
subList
=
null
;
List
<
String
>
subList
=
null
;
if
(
i
!=
orderPageNo
-
1
){
if
(
i
!=
orderPageNo
-
1
){
subList
=
orderNoList
.
subList
(
i
*
pageSize
,
pageSize
);
System
.
out
.
println
(
i
*
pageSize
+
"||"
+
(
i
+
1
)*
pageSize
);
subList
=
orderNoList
.
subList
(
i
*
pageSize
,
(
i
+
1
)*
pageSize
);
}
else
{
}
else
{
subList
=
orderNoList
.
subList
(
i
*
pageSize
,
orderNos
.
size
()-
1
);
System
.
out
.
println
(
i
*
pageSize
+
"||"
+
orderNos
.
size
());
subList
=
orderNoList
.
subList
(
i
*
pageSize
,
orderNos
.
size
());
}
}
JsonResult
<
List
<
ThirdWorkOrderExportVo
>>
orderResult
=
iKdspService
.
getOrderDetailForWorkOder
(
subList
,
tenantId
);
JsonResult
<
List
<
ThirdWorkOrderExportVo
>>
orderResult
=
iKdspService
.
getOrderDetailForWorkOder
(
subList
,
tenantId
);
if
(!
orderResult
.
isSuccess
()){
if
(!
orderResult
.
isSuccess
()){
...
@@ -368,10 +370,6 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
...
@@ -368,10 +370,6 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
continue
;
continue
;
}
}
for
(
ThirdWorkOrderExportVo
kdspOrder
:
kdspOrders
){
for
(
ThirdWorkOrderExportVo
kdspOrder
:
kdspOrders
){
log
.
info
(
"订单数据:{}"
,
JSON
.
toJSONString
(
kdspOrder
));
if
(
"1726483753343406080"
.
equals
(
kdspOrder
.
getOrderNo
())){
System
.
out
.
println
(
"11"
);
}
KdspOrderStatusEnum
orderStatusEnum
=
KdspOrderStatusEnum
.
getByCode
(
kdspOrder
.
getOrderStatus
());
KdspOrderStatusEnum
orderStatusEnum
=
KdspOrderStatusEnum
.
getByCode
(
kdspOrder
.
getOrderStatus
());
if
(
orderStatusEnum
!=
null
){
if
(
orderStatusEnum
!=
null
){
kdspOrder
.
setOrderStatusText
(
orderStatusEnum
.
getDesc
());
kdspOrder
.
setOrderStatusText
(
orderStatusEnum
.
getDesc
());
...
@@ -411,5 +409,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
...
@@ -411,5 +409,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
}
catch
(
Exception
ex
){
}
catch
(
Exception
ex
){
log
.
error
(
"导出excel异常"
,
ex
);
log
.
error
(
"导出excel异常"
,
ex
);
}
}
}
}
}
}
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