From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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/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