From 3acf3d5ee9435576276453ad0fbe0d8f202f10e4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 19:33:52 +0800
Subject: [PATCH] 修改查询到期的接口
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 29 ++++++++++++++++++++---------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 14 ++++++++++----
3 files changed, 31 insertions(+), 14 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..87c7ed7 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
@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
@@ -347,15 +348,25 @@
{
//查询当前医院正在使用的套餐
Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("hospitalId", hospitalId);
- List<ProductOrderJoinDetail> productOrderDetailList = this.findAllList(selectMap);
- if (productOrderDetailList.size() > 0) {
- UserProductDetail userProductDetail=new UserProductDetail();
- //包含共享的数据
- userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList()));
- //科室私有的数据
- userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && !f.getIsShare())).collect(Collectors.toList()));
- return userProductDetail;
+ selectMap.put("hospital_id", hospitalId);
+ selectMap.put("is_del",0);
+ selectMap.put("enabled",1);
+ List<ProductOrder> productOrders = iProductOrderService.listByMap(selectMap);
+ if(productOrders!=null&&productOrders.size()>0){
+// List<ProductOrderJoinDetail> productOrderDetailList = this.findAllList(selectMap);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("is_del",0);
+ queryWrapper.eq("enabled",1);
+ queryWrapper.in("order_id",productOrders.stream().map(ProductOrder::getId).collect(Collectors.toList()));
+ List<ProductOrderJoinDetail> productOrderDetailList = this.baseMapper.selectList(queryWrapper);
+ if (productOrderDetailList.size() > 0) {
+ UserProductDetail userProductDetail=new UserProductDetail();
+ //包含共享的数据
+ userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList()));
+ //科室私有的数据
+ userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && !f.getIsShare())).collect(Collectors.toList()));
+ return userProductDetail;
+ }
}
return null;
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 975f886..1b175da 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -882,7 +882,7 @@
proBegintime: item.beginTime != "" ? item.beginTime +
' 00:00:00' : "",
proEndtime: item.endTime != "" ? item.endTime +
- ' 23:59:59' : "",
+ ' 00:00:00' : "",
orderAilightCount: item.ailightCount,
orderRecordCount: item.recordCount != null ? item.recordCount : 0,
};
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
index 910844c..d53d368 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
@@ -267,6 +267,8 @@
//充值进行中
var isRun = false;
+ var contractBeginTimeVVV="";
+ var contractEndTimeVVV="";
//执行一个laydate实例
var contractBeginTime= laydate.render({
elem: '#contractBeginTime', //指定元素
@@ -565,10 +567,14 @@
} else {
hospitalData.contractBeginTime = layui.util.toDateString(hospitalData.contractBeginTime, 'yyyy-MM-dd')
hospitalData.contractEndTime = layui.util.toDateString(hospitalData.contractEndTime, 'yyyy-MM-dd')
+ contractBeginTimeVVV=hospitalData.contractBeginTime
+ contractEndTimeVVV=hospitalData.contractEndTime
form.val('recharge-form', hospitalData);
+ $("#custom_beginTime").val( hospitalData.contractBeginTime)
+ $("#custom_endTime").val( hospitalData.contractEndTime)
//限制时间
xianzhi();
- getCycleTime();
+ getCycleTime(hospitalData.departmentId);
getHospitalAddress(hospitalData.hospitalId);
//装载产品数据
table.render({
@@ -719,8 +725,8 @@
custom_beginTime = $("#custom_beginTime").val();
custom_endTime = $("#custom_endTime").val();
} else {
- custom_beginTime = $("#contractBeginTime").val();
- custom_endTime = $("#contractEndTime").val();
+ custom_beginTime = contractBeginTimeVVV
+ custom_endTime = contractEndTimeVVV
}
var listData = admin.getTempData("t_tempProduct");
//添加一个id,删除用
@@ -966,7 +972,7 @@
proBegintime: item.beginTime != "" ? item.beginTime +
' 00:00:00' : "",
proEndtime: item.endTime != "" ? item.endTime +
- ' 23:59:59' : "",
+ ' 00:00:00' : "",
orderAilightCount: item.ailightCount,
orderRecordCount: item.recordCount != null ? item.recordCount : 0,
};
--
Gitblit v1.8.0