From 0e2879d8e3110b777bcdcff9d7e8e8a44bf95e7d Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 02 Apr 2020 15:46:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml | 97 +++++++++++++++++++++++++-----------------------
1 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
index 83d1c34..5884ea3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--医生的数据需求-->
-<mapper namespace="com.kidgrow.usercenter.mapper.DataNeedMapper">
+<mapper namespace="com.kidgrow.oprationcenter.mapper.DataNeedMapper">
<!--定义查询列-->
<sql id="Column_List">
*
@@ -11,82 +11,85 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.needType != null and p.needType !=''">
- and need_type = #{p.needType}
+ <if test="p.needType != null and p.needType !=''">
+ and need_type = #{p.needType}
</if>
- <if test="p.doctorId != null and p.doctorId !=''">
- and doctor_id = #{p.doctorId}
+ <if test="p.doctorId != null and p.doctorId !=''">
+ and doctor_id = #{p.doctorId}
</if>
- <if test="p.doctorName != null and p.doctorName !=''">
- and doctor_name = #{p.doctorName}
+ <if test="p.doctorName != null and p.doctorName !=''">
+ and doctor_name like '%${p.doctorName}%'
</if>
- <if test="p.hospitalName != null and p.hospitalName !=''">
- and hospital_name = #{p.hospitalName}
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name = #{p.hospitalName}
</if>
- <if test="p.departmentName != null and p.departmentName !=''">
- and department_name = #{p.departmentName}
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
</if>
- <if test="p.doctorTel != null and p.doctorTel !=''">
- and doctor_tel = #{p.doctorTel}
+ <if test="p.doctorTel != null and p.doctorTel !=''">
+ and doctor_tel = #{p.doctorTel}
</if>
- <if test="p.needBegintime != null and p.needBegintime !=''">
- and need_begintime = #{p.needBegintime}
+ <if test="p.needBegintime != null and p.needBegintime !=''">
+ and need_begintime >= #{p.needBegintime}
</if>
- <if test="p.needEndtime != null and p.needEndtime !=''">
- and need_endtime = #{p.needEndtime}
+ <if test="p.needEndtime != null and p.needEndtime !=''">
+ and need_endtime <= #{p.needEndtime}
</if>
- <if test="p.needTags != null and p.needTags !=''">
- and need_tags = #{p.needTags}
+ <if test="p.needTags != null and p.needTags !=''">
+ and need_tags = #{p.needTags}
</if>
- <if test="p.isDel != null and p.isDel !=''">
- and is_del = #{p.isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="p.dataFile != null and p.dataFile !=''">
- and data_file = #{p.dataFile}
+ <if test="p.dataFile != null and p.dataFile !=''">
+ and data_file = #{p.dataFile}
</if>
- <if test="p.downTime != null and p.downTime !=''">
- and down_time = #{p.downTime}
+ <if test="p.downTime != null and p.downTime !=''">
+ and down_time = #{p.downTime}
</if>
- <if test="p.enabled != null and p.enabled !=''">
- and enabled = #{p.enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="p.createUserId != null and p.createUserId !=''">
- and create_user_id = #{p.createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="p.createUserName != null and p.createUserName !=''">
- and create_user_name = #{p.createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="p.updateUserId != null and p.updateUserId !=''">
- and update_user_id = #{p.updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="p.updateUserName != null and p.updateUserName !=''">
- and update_user_name = #{p.updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="p.createTime != null and p.createTime !=''">
- and create_time = #{p.createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- <if test="p.updateTime != null and p.updateTime !=''">
- and update_time = #{p.updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
- </where>
+ </where>
</sql>
<!--定义根据-DataNeed当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.usercenter.model.DataNeed">
- select <include refid="Column_List"/>
+ <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DataNeed">
+ select
+ <include refid="Column_List"/>
from data_need
<include refid="where"/>
order by id desc
</select>
<!--定义根据-DataNeed当作查询条件返回对象集合-->
- <select id="findList" resultType="com.kidgrow.usercenter.model.DataNeed">
- select <include refid="Column_List"/>
+ <select id="findList" resultType="com.kidgrow.oprationcenter.model.DataNeed">
+ select
+ <include refid="Column_List"/>
from data_need
+ <include refid="where"/>
order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0