Merge remote-tracking branch 'origin/dev' into dev

克 刘

2020-04-02 81aaee286ba7f54ef1b713fedd6d24a9294745df

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.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.oprationcenter.mapper.DoctorServerMapper">
<mapper namespace="com.kidgrow.usercenter.mapper.DoctorServerMapper">
    <!--定义查询列-->
    <sql id="Column_List">
      *
@@ -11,45 +11,45 @@
    <sql id="where">
        <where>
            <!--查询条件自行添加-->
            is_del=0
                                                            <if test="isAnswer != null and isAnswer !=''">
                and  is_answer =  #{isAnswer}
            p.is_del=0
                                                            <if test="p.isAnswer != null and p.isAnswer !=''">
                and  is_answer =  #{p.isAnswer}
            </if>
                                                <if test="isSigning != null and isSigning !=''">
                and  is_signing =  #{isSigning}
                                                <if test="p.isSigning != null and p.isSigning !=''">
                and  is_signing =  #{p.isSigning}
            </if>
                                                <if test="doctorState != null and doctorState !=''">
                and  doctor_state =  #{doctorState}
                                                <if test="p.doctorState != null and p.doctorState !=''">
                and  doctor_state =  #{p.doctorState}
            </if>
                                                <if test="createTime != null and createTime !=''">
                and  create_time =  #{createTime}
                                                <if test="p.createTime != null and p.createTime !=''">
                and  create_time =  #{p.createTime}
            </if>
                                                <if test="updateTime != null and updateTime !=''">
                and  update_time =  #{updateTime}
                                                <if test="p.updateTime != null and p.updateTime !=''">
                and  update_time =  #{p.updateTime}
            </if>
                                                <if test="isDel != null and isDel !=''">
                and  is_del =  #{isDel}
                                                <if test="p.isDel != null and p.isDel !=''">
                and  is_del =  #{p.isDel}
            </if>
                                                <if test="enabled != null and enabled !=''">
                and  enabled =  #{enabled}
                                                <if test="p.enabled != null and p.enabled !=''">
                and  enabled =  #{p.enabled}
            </if>
                                                <if test="createUserId != null and createUserId !=''">
                and  create_user_id =  #{createUserId}
                                                <if test="p.createUserId != null and p.createUserId !=''">
                and  create_user_id =  #{p.createUserId}
            </if>
                                                <if test="createUserName != null and createUserName !=''">
                and  create_user_name =  #{createUserName}
                                                <if test="p.createUserName != null and p.createUserName !=''">
                and  create_user_name =  #{p.createUserName}
            </if>
                                                <if test="updateUserId != null and updateUserId !=''">
                and  update_user_id =  #{updateUserId}
                                                <if test="p.updateUserId != null and p.updateUserId !=''">
                and  update_user_id =  #{p.updateUserId}
            </if>
                                                <if test="updateUserName != null and updateUserName !=''">
                and  update_user_name =  #{updateUserName}
                                                <if test="p.updateUserName != null and p.updateUserName !=''">
                and  update_user_name =  #{p.updateUserName}
            </if>
                                </where>
    </sql>

    <!--定义根据-DoctorServer当作查询条件返回对象-->
    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.DoctorServer">
    <select id="findByObject"  resultType="com.kidgrow.usercenter.model.DoctorServer">
        select <include refid="Column_List"/>
        from doctor_server
        <include refid="where"/>
@@ -57,7 +57,7 @@
    </select>

    <!--定义根据-DoctorServer当作查询条件返回对象集合-->
    <select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorServer">
    <select id="findList" resultType="com.kidgrow.usercenter.model.DoctorServer">
        select <include refid="Column_List"/>
        from doctor_server
        order by id desc