From e940b53f9d8fd9056aee2870e41a6e7932b2e8d6 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Mon, 24 Aug 2020 17:21:41 +0800 Subject: [PATCH] 1.修改获取余额的时候,将预扣费算作有效的bug 2.医院管理 增加了显示医院编号 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 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 101b084..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(); -- Gitblit v1.8.0