xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序服务评价代码修改

Browse Source
This commit is contained in:
张恒 2023-10-20 16:22:09 +08:00
parent 1105f1eb34
commit 1869987d7b
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java
View File

@ -46,7 +46,7 @@ public class NursingOrderController extends BaseController {
* 根据护理人id以及订单状态查询订单信息
*/
@MobileRequestAuthorization
@GetMapping("/goodsOrder")
@PostMapping("/goodsOrder")
public TableDataInfo goodsOrder(@RequestBody AppletGoodsOrderVO goodsOrderVO) {
startPage();
List<AppletGoodsOrderVO> 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);
}
}

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java
View File

@ -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<PatientOrder> getAppletOrderList(NurseOrderDTO nurseOrder);
TableDataInfo getAppletOrderList(NurseOrderDTO nurseOrder);
}

13
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
View File

@ -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<PatientOrder> getAppletOrderList(NurseOrderDTO nurseOrder) {
public TableDataInfo getAppletOrderList(NurseOrderDTO nurseOrder) {
List<PatientOrder> patientOrders = new ArrayList<>();
List<PatientOrder> appletOrderList = new ArrayList<>();
List<PatientOrder> 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;
}
}

6
xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml
View File

@ -155,8 +155,8 @@
<if test="orderType != null and orderType != ''">
and gr.order_type = #{orderType}
</if>
<if test="orderTypeList != null and orderTypeList != ''">
gr.order_typ in
<if test="orderTypeList != null and orderTypeList.size > 0">
and gr.order_type in
<foreach collection="orderTypeList" item="orderTypeList" open="(" separator="," close=")">
#{orderTypeList}
</foreach>
@ -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
<if test="orderStatusList != null and orderStatusList != ''">
<if test="orderTypeList != null and orderTypeList.size > 0">
gor.order_status in
<foreach collection="orderStatusList" item="orderStatusList" open="(" separator="," close=")">
#{orderStatusList}