From b0e0f0cb9dbf68af601d07650ef522f2237cbc06 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 17:40:57 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序（修复）
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
index d41f640..2d82958 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.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.model.PageResult;
import com.kidgrow.common.model.ResultBody;
@@ -57,7 +58,21 @@
@Override
public List<DataNeedExcel> findListExportByParam(Map<String, Object> params) {
- List<DataNeed> dataNeeds = baseMapper.selectByMap(params);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ String doctor_name = MapUtils.getString(params, "doctor_name");
+ if(doctor_name!=null){
+ queryWrapper.like("doctor_name","%"+doctor_name+"%");
+ }
+ String need_begintime = MapUtils.getString(params, "need_begintime");
+ if(need_begintime!=null){
+ queryWrapper.gt("need_begintime",need_begintime);
+ }
+ String need_endtime = MapUtils.getString(params, "need_endtime");
+ if(need_endtime!=null){
+ queryWrapper.gt("need_endtime",need_endtime);
+ }
+ queryWrapper.eq("is_del",0);
+ List<DataNeed> dataNeeds = baseMapper.selectList(queryWrapper);
List<DataNeedExcel> voList=new ArrayList<>();
dataNeeds.forEach(e ->{
DataNeedExcel vo=new DataNeedExcel();
@@ -113,8 +128,11 @@
ResultBody listByMap = sysDoctorService.getListByMap(doctoerMap);
List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class);
if (sysDoctors!=null&&sysDoctors.size()>0){
- List<DataNeed> dataNeedList=baseMapper.findHList(map);
- return ResultBody.ok().data(dataNeedList);
+ Page<DataNeed> page = new Page<>(MapUtils.getInteger(map, "page"), MapUtils.getInteger(map, "limit"));
+// List<DataNeed> dataNeedList=baseMapper.findHList(map);
+ List<DataNeed> list = baseMapper.findList(page, map);
+ PageResult<DataNeed> build = PageResult.<DataNeed>builder().data(list).code(0).count(page.getTotal()).build();
+ return ResultBody.ok().data(build);
}else {
return ResultBody.failed("非管理用户无权查看");
}
--
Gitblit v1.8.0