From 77dbb85286de0ec52d8144bb7c89483c2909a07e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 21 Jul 2020 15:31:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index e21b4b8..853e235 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -9,9 +9,12 @@
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
+import com.kidgrow.oprationcenter.mapper.ProductOrderMapper;
import com.kidgrow.oprationcenter.model.ConsumptionRecord;
+import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
+import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.*;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
@@ -19,6 +22,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -43,6 +47,8 @@
private SysHospitalService sysHospitalService;
@Autowired
private ConsumptionRecordMapper consumptionRecordMapper;
+ @Autowired
+ private IProductOrderService iProductOrderService;
/**
* 列表
* @param params
@@ -88,6 +94,31 @@
}
return ResultBody.ok().data(userProductData);
}
+
+ @Override
+ public PageResult all(Map<String, Object> params) {
+ Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ List<ProductOrderDetail> list = baseMapper.findList(page, params);
+ List<ProductOrderDetailVo> volist=new ArrayList<>();
+ for (ProductOrderDetail productOrderDetail : list) {
+ ProductOrderDetailVo productOrderDetailVo=new ProductOrderDetailVo();
+ BeanCopier beanCopier = BeanCopier.create(ProductOrderDetail.class, ProductOrderDetailVo.class, false);
+ beanCopier.copy(productOrderDetail,productOrderDetailVo,null);
+ //查询医院
+ if(productOrderDetail.getOrderId()!=null){
+ ProductOrder productOrder = iProductOrderService.getById(productOrderDetail.getOrderId());
+ if(productOrder!=null){
+ productOrderDetailVo.setDepartmentId(productOrder.getDepartmentId());
+ productOrderDetailVo.setDepartmentName(productOrder.getDepartmentName());
+ productOrderDetailVo.setHospitalId(productOrder.getHospitalId());
+ productOrderDetailVo.setHospitalName(productOrder.getHospitalName());
+ }
+ volist.add(productOrderDetailVo);
+ }
+ }
+ return PageResult.<ProductOrderDetailVo>builder().data(volist).code(0).count(page.getTotal()).build();
+ }
+
/**
* 获取诊断列表
* @param params
--
Gitblit v1.8.0