Commit 578b9f4e by huluobin

评论列表根据时间筛选。

parent 4d821a0d
...@@ -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);
} }
...@@ -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("");
......
...@@ -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 &lt; = #{endTime}
</if>
<if test="startTime != null">
oc.create_time &gt; = #{startTime}
</if>
order by create_time desc order by create_time desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment