Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pension
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
mengmeng
pension
Commits
fde588e1
Commit
fde588e1
authored
Mar 12, 2021
by
mlchun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.订单详情添加图片
parent
f8574e3b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
PensionOrderController.java
...dules/serviceOrder/controller/PensionOrderController.java
+5
-4
PensionServiceDocumentDao.java
...t/modules/serviceOrder/dao/PensionServiceDocumentDao.java
+2
-1
No files found.
hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderController.java
View file @
fde588e1
...
...
@@ -13,12 +13,9 @@ import io.hmit.common.validator.group.DefaultGroup;
import
io.hmit.common.validator.group.UpdateGroup
;
import
io.hmit.entity.UserEntity
;
import
io.hmit.modules.serviceOrder.dto.PensionOrderDTO
;
import
io.hmit.modules.serviceOrder.dto.PensionOrderEvaluationDTO
;
import
io.hmit.modules.serviceOrder.dto.ReservationDTO
;
import
io.hmit.modules.serviceOrder.dto.StaffFinishDTO
;
import
io.hmit.modules.serviceOrder.service.PensionOrderDocumentService
;
import
io.hmit.modules.serviceOrder.service.PensionOrderEvaluationService
;
import
io.hmit.modules.serviceOrder.service.PensionOrderService
;
import
io.hmit.modules.serviceOrder.service.*
;
import
io.hmit.service.UserService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -54,6 +51,9 @@ public class PensionOrderController {
@Autowired
private
PensionOrderEvaluationService
pensionOrderEvaluationService
;
@Autowired
private
PensionServiceService
pensionServiceService
;
@Login
@GetMapping
(
"page"
)
@ApiOperation
(
"全部订单(志愿者)"
)
...
...
@@ -304,6 +304,7 @@ public class PensionOrderController {
data
.
setStaffVoiceMessage
(
pensionOrderDocumentService
.
findStaffVoiceId
(
id
));
data
.
setUserImages
(
pensionOrderDocumentService
.
findByOrderIdAndRemark
(
id
,
"3"
));
data
.
setPensionOrderEvaluationDTO
(
pensionOrderEvaluationService
.
findByOrderId
(
id
));
data
.
setIcon
(
pensionServiceService
.
get
(
data
.
getServiceId
()).
getDetailPicture
());
return
new
Result
<
PensionOrderDTO
>().
ok
(
data
);
}
...
...
hmit-api/src/main/java/io/hmit/modules/serviceOrder/dao/PensionServiceDocumentDao.java
View file @
fde588e1
package
io
.
hmit
.
modules
.
serviceOrder
.
dao
;
import
io.hmit.common.dao.BaseDao
;
import
io.hmit.modules.serviceOrder.dto.PensionServiceDocumentDTO
;
import
io.hmit.modules.serviceOrder.entity.PensionServiceDocumentEntity
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
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