Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
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
huluobin
gogirl-miniapp-backend
Commits
578b9f4e
Commit
578b9f4e
authored
Apr 09, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
评论列表根据时间筛选。
parent
4d821a0d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
OrderCommentMapper.java
...infrastructure/mapper/order/serve/OrderCommentMapper.java
+6
-1
OrderManageController.java
.../gogirl/interfaces/order/serve/OrderManageController.java
+8
-2
OrderCommentMapper.xml
src/main/resources/mapper/order/OrderCommentMapper.xml
+6
-0
No files found.
src/main/java/com/gogirl/infrastructure/mapper/order/serve/OrderCommentMapper.java
View file @
578b9f4e
...
@@ -7,6 +7,8 @@ import com.gogirl.domain.order.serve.OrderComment;
...
@@ -7,6 +7,8 @@ import com.gogirl.domain.order.serve.OrderComment;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
java.time.LocalDateTime
;
/**
/**
* Created by yinyong on 2018/10/19.
* Created by yinyong on 2018/10/19.
*/
*/
...
@@ -23,5 +25,8 @@ public interface OrderCommentMapper extends BaseMapper<OrderComment> {
...
@@ -23,5 +25,8 @@ public interface OrderCommentMapper extends BaseMapper<OrderComment> {
* @param technicianId
* @param technicianId
* @return
* @return
*/
*/
Page
<
OrderComment
>
queryMyCommentForPage
(
Page
<
OrderComment
>
page
,
@Param
(
"technicianId"
)
Integer
technicianId
);
Page
<
OrderComment
>
queryMyCommentForPage
(
Page
<
OrderComment
>
page
,
@Param
(
"technicianId"
)
Integer
technicianId
,
@Param
(
"startTime"
)
LocalDateTime
startTime
,
@Param
(
"endTime"
)
LocalDateTime
endTime
);
}
}
src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java
View file @
578b9f4e
...
@@ -2,6 +2,7 @@ package com.gogirl.interfaces.order.serve;
...
@@ -2,6 +2,7 @@ package com.gogirl.interfaces.order.serve;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.gogirl.application.order.serve.OrderManageService
;
import
com.gogirl.application.order.serve.OrderManageService
;
import
com.gogirl.application.order.serve.OrderServeService
;
import
com.gogirl.application.order.serve.OrderServeService
;
import
com.gogirl.application.order.serve.ScheduleManageService
;
import
com.gogirl.application.order.serve.ScheduleManageService
;
...
@@ -30,6 +31,7 @@ import lombok.AllArgsConstructor;
...
@@ -30,6 +31,7 @@ import lombok.AllArgsConstructor;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.Optional
;
...
@@ -236,10 +238,14 @@ public class OrderManageController {
...
@@ -236,10 +238,14 @@ public class OrderManageController {
@GetMapping
(
"/technician/ordermanage/getMyOrderComment"
)
@GetMapping
(
"/technician/ordermanage/getMyOrderComment"
)
public
JsonResult
<
IPage
<
OrderComment
>>
getMyOrderComment
(
@RequestParam
Integer
pageNum
,
public
JsonResult
<
IPage
<
OrderComment
>>
getMyOrderComment
(
@RequestParam
Integer
pageNum
,
@RequestParam
Integer
pageSize
,
@RequestParam
Integer
pageSize
,
@RequestHeader
String
token
)
{
@RequestHeader
String
token
,
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@RequestParam
LocalDateTime
startTime
,
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@RequestParam
LocalDateTime
endTime
)
{
Integer
technicianId
=
SessionUtils
.
getTechnicianId
();
Integer
technicianId
=
SessionUtils
.
getTechnicianId
();
Page
<
OrderComment
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
Page
<
OrderComment
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
IPage
<
OrderComment
>
orderCommentIPage
=
orderCommentMapper
.
queryMyCommentForPage
(
page
,
technicianId
);
IPage
<
OrderComment
>
orderCommentIPage
=
orderCommentMapper
.
queryMyCommentForPage
(
page
,
technicianId
,
startTime
,
endTime
);
orderCommentIPage
.
getRecords
().
forEach
(
orderComment
->
{
orderCommentIPage
.
getRecords
().
forEach
(
orderComment
->
{
if
(
StringUtils
.
isEmpty
(
orderComment
.
getRemark
()))
{
if
(
StringUtils
.
isEmpty
(
orderComment
.
getRemark
()))
{
orderComment
.
setRemark
(
""
);
orderComment
.
setRemark
(
""
);
...
...
src/main/resources/mapper/order/OrderCommentMapper.xml
View file @
578b9f4e
...
@@ -127,6 +127,12 @@
...
@@ -127,6 +127,12 @@
left join order_manage om on oc.order_id = om.id
left join order_manage om on oc.order_id = om.id
left join customer cus on om.order_user = cus.id
left join customer cus on om.order_user = cus.id
where oc.technician_id = #{technicianId}
where oc.technician_id = #{technicianId}
<if
test=
"endTime != null"
>
oc.create_time
<
= #{endTime}
</if>
<if
test=
"startTime != null"
>
oc.create_time
>
= #{startTime}
</if>
order by create_time desc
order by create_time desc
</select>
</select>
...
...
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