Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit f44d7e8f
authored
May 19, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改方法名,符合java规范
1 parent
b61c4907
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrderServiceListController.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/OrderServiceListService.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceListServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrderServiceListController.java
View file @
f44d7e8
...
@@ -16,7 +16,7 @@ public class OrderServiceListController {
...
@@ -16,7 +16,7 @@ public class OrderServiceListController {
private
OrderServiceListService
orderServiceListService
;
private
OrderServiceListService
orderServiceListService
;
@GetMapping
(
"/order/service/list"
)
@GetMapping
(
"/order/service/list"
)
public
Result
<?>
G
etOrderServiceList
(
@RequestParam
(
"startDate"
)
String
startDate
,
public
Result
<?>
g
etOrderServiceList
(
@RequestParam
(
"startDate"
)
String
startDate
,
@RequestParam
(
"endDate"
)
String
endDate
,
@RequestParam
(
"endDate"
)
String
endDate
,
@RequestParam
(
"page"
)
long
page
,
@RequestParam
(
"page"
)
long
page
,
@RequestParam
(
"size"
)
long
size
,
@RequestParam
(
"size"
)
long
size
,
...
@@ -28,7 +28,7 @@ public class OrderServiceListController {
...
@@ -28,7 +28,7 @@ public class OrderServiceListController {
@RequestParam
(
"skill"
)
String
skill
)
{
@RequestParam
(
"skill"
)
String
skill
)
{
Result
<?>
res
=
null
;
Result
<?>
res
=
null
;
try
{
try
{
res
=
orderServiceListService
.
G
etOrderServiceList
(
startDate
,
endDate
,
page
,
size
,
sort
,
appointmentType
,
res
=
orderServiceListService
.
g
etOrderServiceList
(
startDate
,
endDate
,
page
,
size
,
sort
,
appointmentType
,
appointmentStatus
,
type
,
brand
,
skill
);
appointmentStatus
,
type
,
brand
,
skill
);
}
}
catch
(
BusinessException
e
)
{
catch
(
BusinessException
e
)
{
...
...
project-order/src/main/java/com/alibaba/cloud/integration/order/service/OrderServiceListService.java
View file @
f44d7e8
...
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
...
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
public
interface
OrderServiceListService
{
public
interface
OrderServiceListService
{
Result
<
OrderServiceListResp
>
G
etOrderServiceList
(
Result
<
OrderServiceListResp
>
g
etOrderServiceList
(
String
startDate
,
String
endDate
,
long
page
,
long
size
,
String
sort
,
String
startDate
,
String
endDate
,
long
page
,
long
size
,
String
sort
,
String
appointmentType
,
String
appointmentStatus
,
String
type
,
String
brand
,
String
appointmentType
,
String
appointmentStatus
,
String
type
,
String
brand
,
String
skill
)
throws
BusinessException
;
String
skill
)
throws
BusinessException
;
...
...
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceListServiceImpl.java
View file @
f44d7e8
...
@@ -36,7 +36,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
...
@@ -36,7 +36,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
@Transactional
@Transactional
@Override
@Override
public
Result
<
OrderServiceListResp
>
G
etOrderServiceList
(
public
Result
<
OrderServiceListResp
>
g
etOrderServiceList
(
String
startDate
,
String
endDate
,
long
page
,
long
size
,
String
sort
,
String
startDate
,
String
endDate
,
long
page
,
long
size
,
String
sort
,
String
appointmentType
,
String
appointmentStatus
,
String
type
,
String
brand
,
String
appointmentType
,
String
appointmentStatus
,
String
type
,
String
brand
,
String
skill
)
throws
BusinessException
{
String
skill
)
throws
BusinessException
{
...
@@ -45,8 +45,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
...
@@ -45,8 +45,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
IPage
<
OrderRequest
>
pg
=
new
Page
(
page
,
size
);
IPage
<
OrderRequest
>
pg
=
new
Page
(
page
,
size
);
LambdaQueryWrapper
<
OrderRequest
>
lqw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
OrderRequest
>
lqw
=
new
LambdaQueryWrapper
<>();
lqw
.
ge
(
OrderRequest:
:
getExpectTimeBegin
,
this
.
G
etTimestampFromDate
(
startDate
));
//预约开始日期
lqw
.
ge
(
OrderRequest:
:
getExpectTimeBegin
,
this
.
g
etTimestampFromDate
(
startDate
));
//预约开始日期
lqw
.
le
(
OrderRequest:
:
getExpectTimeBegin
,
this
.
G
etTimestampFromDate
(
endDate
));
//预约结束日期
lqw
.
le
(
OrderRequest:
:
getExpectTimeBegin
,
this
.
g
etTimestampFromDate
(
endDate
));
//预约结束日期
lqw
.
eq
(
Strings
.
isNotEmpty
(
appointmentStatus
),
OrderRequest:
:
getAppointmentStatus
,
appointmentStatus
);
//指派状态
lqw
.
eq
(
Strings
.
isNotEmpty
(
appointmentStatus
),
OrderRequest:
:
getAppointmentStatus
,
appointmentStatus
);
//指派状态
lqw
.
eq
(
Strings
.
isNotEmpty
(
type
),
OrderRequest:
:
getType
,
type
);
//设备类型
lqw
.
eq
(
Strings
.
isNotEmpty
(
type
),
OrderRequest:
:
getType
,
type
);
//设备类型
lqw
.
eq
(
Strings
.
isNotEmpty
(
brand
),
OrderRequest:
:
getBrand
,
brand
);
//品牌
lqw
.
eq
(
Strings
.
isNotEmpty
(
brand
),
OrderRequest:
:
getBrand
,
brand
);
//品牌
...
@@ -63,7 +63,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
...
@@ -63,7 +63,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
orderIds
.
add
(
r
.
getOrderId
());
orderIds
.
add
(
r
.
getOrderId
());
}
}
// 获取工程师姓名列表
// 获取工程师姓名列表
HashMap
<
String
,
List
<
String
>>
engineerNames
=
this
.
getEngineerNames
(
this
.
G
etOrderAppointments
(
orderIds
));
HashMap
<
String
,
List
<
String
>>
engineerNames
=
this
.
getEngineerNames
(
this
.
g
etOrderAppointments
(
orderIds
));
List
<
String
>
names
;
List
<
String
>
names
;
List
<
OrderServiceList
>
content
=
new
ArrayList
<>();
List
<
OrderServiceList
>
content
=
new
ArrayList
<>();
...
@@ -101,7 +101,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
...
@@ -101,7 +101,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
}
}
public
List
<
OrderAppointment
>
G
etOrderAppointments
(
List
<
String
>
orderIds
)
{
public
List
<
OrderAppointment
>
g
etOrderAppointments
(
List
<
String
>
orderIds
)
{
// 获取指派单列表
// 获取指派单列表
if
(
CollectionUtil
.
isEmpty
(
orderIds
))
{
if
(
CollectionUtil
.
isEmpty
(
orderIds
))
{
return
new
ArrayList
<
OrderAppointment
>();
return
new
ArrayList
<
OrderAppointment
>();
...
@@ -170,7 +170,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
...
@@ -170,7 +170,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
return
String
.
join
(
"、"
,
names
);
return
String
.
join
(
"、"
,
names
);
}
}
public
Timestamp
G
etTimestampFromDate
(
String
date
){
public
Timestamp
g
etTimestampFromDate
(
String
date
){
return
Timestamp
.
valueOf
(
date
+
" 00:00:00"
);
return
Timestamp
.
valueOf
(
date
+
" 00:00:00"
);
}
}
}
}
Write
Preview
Markdown
is supported
Attach a file
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 post a comment