From 1869987d7b9f606fd75fd0a71182e3f08e22f4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= Date: Fri, 20 Oct 2023 16:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nursingorder/NursingOrderController.java | 4 ++-- .../service/nursingorder/INursingOrderService.java | 4 ++-- .../nursingorder/impl/NursingOrderServiceImpl.java | 13 +++++++++++-- .../applet/nursingorder/NusringOrderMapper.xml | 6 +++--- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java index 4354a3b..e610b29 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java @@ -46,7 +46,7 @@ public class NursingOrderController extends BaseController { * 根据护理人id以及订单状态查询订单信息 */ @MobileRequestAuthorization - @GetMapping("/goodsOrder") + @PostMapping("/goodsOrder") public TableDataInfo goodsOrder(@RequestBody AppletGoodsOrderVO goodsOrderVO) { startPage(); List goodsOrder = nursingOrderService.getGoodsOrder(goodsOrderVO); @@ -105,6 +105,6 @@ public class NursingOrderController extends BaseController { if (Objects.isNull(nurseOrder) || Objects.isNull(nurseOrder.getParentId()) || StringUtils.isBlank(nurseOrder.getCardNo()) || StringUtils.isBlank(nurseOrder.getOrderStatus())) { return getDataTable(new ArrayList<>()); } - return getDataTable(nursingOrderService.getAppletOrderList(nurseOrder)); + return nursingOrderService.getAppletOrderList(nurseOrder); } } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java index 7347154..7a1b5a1 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java @@ -4,9 +4,9 @@ package com.xinelu.applet.service.nursingorder; import com.xinelu.applet.dto.nurseorder.NurseOrderDTO; import com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO; import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; -import com.xinelu.applet.vo.nursingorder.PatientOrder; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; import java.util.List; @@ -64,5 +64,5 @@ public interface INursingOrderService { * @param nurseOrder nurseOrder * @return AjaxResult */ - List getAppletOrderList(NurseOrderDTO nurseOrder); + TableDataInfo getAppletOrderList(NurseOrderDTO nurseOrder); } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java index 5591be3..50d7bb3 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.xinelu.applet.service.nursingorder.impl; import com.alibaba.fastjson2.JSON; +import com.github.pagehelper.PageInfo; import com.xinelu.applet.dto.nurseorder.NurseOrderDTO; import com.xinelu.applet.mapper.nursingorder.NursingOrderMapper; import com.xinelu.applet.service.nursingorder.INursingOrderService; @@ -10,13 +11,16 @@ import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; import com.xinelu.applet.vo.nursingorder.PatientOrder; import com.xinelu.applet.vo.nursingorder.PatientOrderVO; import com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO; +import com.xinelu.common.constant.HttpStatus; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.ConfirmRefundStatusEnum; import com.xinelu.common.enums.GooodsOrderStatusEnum; import com.xinelu.common.enums.OrderSourceEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.http.HttpUtils; import com.xinelu.common.utils.spring.SpringUtils; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; @@ -135,7 +139,7 @@ public class NursingOrderServiceImpl implements INursingOrderService { * @return AjaxResult */ @Override - public List getAppletOrderList(NurseOrderDTO nurseOrder) { + public TableDataInfo getAppletOrderList(NurseOrderDTO nurseOrder) { List patientOrders = new ArrayList<>(); List appletOrderList = new ArrayList<>(); List goodsOrderAndConsultationOrder = new ArrayList<>(); @@ -182,10 +186,15 @@ public class NursingOrderServiceImpl implements INursingOrderService { patientOrders.addAll(data); } } + TableDataInfo rspData = new TableDataInfo(); + rspData.setTotal(new PageInfo(patientOrders).getTotal()); if (CollectionUtils.isNotEmpty(patientOrders)) { Collections.sort(patientOrders, Comparator.comparing(PatientOrder::getCreateTime, (u1, u2) -> u2.compareTo(u1))); patientOrders = patientOrders.stream().skip((nurseOrder.getPageNum() - 1) * nurseOrder.getPageSize()).limit(nurseOrder.getPageSize()).collect(Collectors.toList()); } - return patientOrders; + rspData.setRows(patientOrders); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + return rspData; } } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml index fbea41b..5dac6e9 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -155,8 +155,8 @@ and gr.order_type = #{orderType} - - gr.order_typ in + + and gr.order_type in #{orderTypeList} @@ -384,7 +384,7 @@ LEFT JOIN hospital_person_info hpi ON hpi.id = gor.hospital_person_id LEFT JOIN order_evaluate_info nei ON nei.order_no = gor.order_no where - + gor.order_status in #{orderStatusList}