Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
external
on-site-service
Commits
d9cb603a
Commit
d9cb603a
authored
Jul 20, 2022
by
lining
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: orderStatusValue返回值
parent
ddfa163d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
ServiceOrderVO.java
...ava/com/onsiteservice/common/order/vo/ServiceOrderVO.java
+3
-0
ServiceOrderController.java
...vice/miniapp/controller/order/ServiceOrderController.java
+3
-0
No files found.
common/src/main/java/com/onsiteservice/common/order/vo/ServiceOrderVO.java
View file @
d9cb603a
...
@@ -48,4 +48,7 @@ public class ServiceOrderVO {
...
@@ -48,4 +48,7 @@ public class ServiceOrderVO {
@ApiModelProperty
(
value
=
"订单流程信息"
)
@ApiModelProperty
(
value
=
"订单流程信息"
)
private
List
<
ServiceOrderLogVO
>
process
;
private
List
<
ServiceOrderLogVO
>
process
;
@ApiModelProperty
(
value
=
"订单状态"
)
private
Integer
orderStatus
;
}
}
\ No newline at end of file
mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/ServiceOrderController.java
View file @
d9cb603a
package
com
.
onsiteservice
.
miniapp
.
controller
.
order
;
package
com
.
onsiteservice
.
miniapp
.
controller
.
order
;
import
com.onsiteservice.common.annotation.dict.Dict
;
import
com.onsiteservice.common.annotation.user.CurrentUserId
;
import
com.onsiteservice.common.annotation.user.CurrentUserId
;
import
com.onsiteservice.common.order.dto.*
;
import
com.onsiteservice.common.order.dto.*
;
import
com.onsiteservice.common.order.vo.OrderPayVO
;
import
com.onsiteservice.common.order.vo.OrderPayVO
;
import
com.onsiteservice.common.order.vo.ServiceOrderLogVO
;
import
com.onsiteservice.common.order.vo.ServiceOrderLogVO
;
import
com.onsiteservice.common.order.vo.ServiceOrderVO
;
import
com.onsiteservice.common.order.vo.ServiceOrderVO
;
import
com.onsiteservice.constant.constant.DictConstants
;
import
com.onsiteservice.constant.enums.ServiceOrderOpSourceEnum
;
import
com.onsiteservice.constant.enums.ServiceOrderOpSourceEnum
;
import
com.onsiteservice.core.result.Result
;
import
com.onsiteservice.core.result.Result
;
import
com.onsiteservice.dao.common.page.PageInfoVO
;
import
com.onsiteservice.dao.common.page.PageInfoVO
;
...
@@ -56,6 +58,7 @@ public class ServiceOrderController {
...
@@ -56,6 +58,7 @@ public class ServiceOrderController {
return
success
(
serviceOrderBizService
.
selectById
(
id
,
userId
));
return
success
(
serviceOrderBizService
.
selectById
(
id
,
userId
));
}
}
@Dict
(
code
=
DictConstants
.
ORDER_STATUS
,
name
=
"orderStatus"
)
@ApiOperation
(
value
=
"分页查询订单"
)
@ApiOperation
(
value
=
"分页查询订单"
)
@PostMapping
(
"page"
)
@PostMapping
(
"page"
)
public
Result
<
PageInfoVO
<
ServiceOrderVO
>>
getPage
(
@RequestBody
@NonNull
@Validated
PageServiceOrderDTO
dto
,
@CurrentUserId
Long
userId
)
{
public
Result
<
PageInfoVO
<
ServiceOrderVO
>>
getPage
(
@RequestBody
@NonNull
@Validated
PageServiceOrderDTO
dto
,
@CurrentUserId
Long
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