From a42289c269e2c0c89dc9ffd0e82d051d874a5c95 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 02 Dec 2020 13:04:52 +0800
Subject: [PATCH] 修改获取列表的bug
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 98ec8aa..b0110e0 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
@@ -224,11 +224,36 @@
* @return
*/
@Override
- public PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params) {
+ public PageResult<ProductOrderDetailVo> departmentProductDetail(Map<String, Object> params) {
Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ Boolean enabled = MapUtils.getBoolean(params, "enabled");
+ if(enabled==null){
+ enabled=true;
+ }
List<ProductOrderDetail> list =
- baseMapper.departmentProductDetail(page, Long.parseLong(params.get("hospitalId").toString()),Long.parseLong(params.get("departmentId").toString()));
- return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build();
+ baseMapper.departmentProductDetail(page, Long.parseLong(params.get("hospitalId").toString()),Long.parseLong(params.get("departmentId").toString()),enabled);
+ List<ProductOrderDetailVo> listvo = new ArrayList<>();
+ for (ProductOrderDetail productOrderDetail : list) {
+ ProductOrderDetailVo productOrderDetailVo=new ProductOrderDetailVo();
+ BeanCopier beanCopier = BeanCopier.create(ProductOrderDetail.class, ProductOrderDetailVo.class, false);
+ beanCopier.copy(productOrderDetail,productOrderDetailVo,null);
+ Date proBegintime = productOrderDetailVo.getProBegintime();
+ Date proEndtime = productOrderDetailVo.getProEndtime();
+ Date nowDate = new Date();
+ if(productOrderDetailVo.getEnabled()){
+ if(nowDate.getTime()<proBegintime.getTime()){
+ productOrderDetailVo.setUseType("未使用");
+ }else if (proBegintime.getTime()<=nowDate.getTime()&&nowDate.getTime()<proEndtime.getTime()){
+ productOrderDetailVo.setUseType("使用中");
+ }else if(nowDate.getTime()>=proEndtime.getTime()){
+ productOrderDetailVo.setUseType("已结束");
+ }
+ }else {
+ productOrderDetailVo.setUseType("禁用");
+ }
+ listvo.add(productOrderDetailVo);
+ }
+ return PageResult.<ProductOrderDetailVo>builder().data(listvo).code(0).count(page.getTotal()).build();
}
@Override
--
Gitblit v1.8.0