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

克 刘

2020-04-02 a6e07e4a32ba8a01c9f7ba5c30b638a925c65d46

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

 kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm

@@ -11,7 +11,7 @@
    <sql id="where">
        <where>
            <!--查询条件自行添加-->
            p.is_del=0
            is_del=0
            #foreach($column in $columns)
            #if($column.columnName != $pk.columnName || $pk.extra != 'auto_increment')
            <if test="p.$column.attrname != null and p.$column.attrname !=''">

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.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.BusinessRecordsMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.BusinessRecordsMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -64,17 +64,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.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.BusinessServerMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.BusinessServerMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -58,17 +58,20 @@
    </sql>

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

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

 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,7 +11,7 @@
    <sql id="where">
        <where>
            <!--查询条件自行添加-->
            p.is_del=0
            is_del=0
                                    <if test="p.id != null and p.id !=''">
                and  id =  #{p.id}
            </if>
@@ -22,7 +22,7 @@
                and  doctor_id =  #{p.doctorId}
            </if>
                                                <if test="p.doctorName != null and p.doctorName !=''">
                and  doctor_name =  #{p.doctorName}
                and doctor_name like '%${p.doctorName}%'
            </if>
                                                <if test="p.hospitalName != null and p.hospitalName !=''">
                and  hospital_name =  #{p.hospitalName}
@@ -34,10 +34,10 @@
                and  doctor_tel =  #{p.doctorTel}
            </if>
                                                <if test="p.needBegintime != null and p.needBegintime !=''">
                and  need_begintime =  #{p.needBegintime}
                and need_begintime &gt;= #{p.needBegintime}
            </if>
                                                <if test="p.needEndtime != null and p.needEndtime !=''">
                and  need_endtime =  #{p.needEndtime}
                and need_endtime &lt;= #{p.needEndtime}
            </if>
                                                <if test="p.needTags != null and p.needTags !=''">
                and  need_tags =  #{p.needTags}
@@ -76,17 +76,20 @@
    </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>

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.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.DoctorAnswerMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.DoctorAnswerMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -40,17 +40,20 @@
    </sql>

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

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

 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.usercenter.mapper.DoctorServerMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.DoctorServerMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -49,17 +49,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.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.DoctorSigningMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.DoctorSigningMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -40,17 +40,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.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.DoctorTempleteMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.DoctorTempleteMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -73,17 +73,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.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.HospitalScreeningMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.HospitalScreeningMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -55,17 +55,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.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.ProductOrderDetailMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -67,17 +67,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.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.ProductOrderMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -70,17 +70,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.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.SysFeedbackMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysFeedbackMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -67,17 +67,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.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.SysLoggerMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysLoggerMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -40,17 +40,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.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.SysProductMapper">
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysProductMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
@@ -61,17 +61,20 @@
    </sql>

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

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml

@@ -59,6 +59,7 @@
    ignoreTables:
      - sys_user
      - sys_logger
      - data_need
    ignoreSqls:
      - com.kidgrow.usercenter.mapper.SysRoleMapper.findAll


 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html

New file
@@ -0,0 +1,211 @@
<div class="layui-card">
    <div class="layui-card-header">
        <h2 class="header-title">应用管理</h2>
        <span class="layui-breadcrumb pull-right">
            <a href="#!home_console">首页</a>
            <a><cite>应用管理</cite></a>
        </span>
    </div>
    <div class="layui-card-body">
        <div class="layui-form toolbar">
            <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" />&emsp;
            <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
                class="layui-input search-input" id="test2"> &emsp;
            <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
            <!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button> -->
            <button id="app-btn-export" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>导出</button>
        </div>

        <!-- 数据表格 -->
        <table class="layui-table" id="app-table" lay-filter="app-table"></table>
    </div>
</div>

<!-- 表格操作列 -->
<script type="text/html" id="app-table-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>

<!-- 表单弹窗 -->
<!-- <script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">应用标识</label>
            <div class="layui-input-block">
                <input name="clientId" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"
                       lay-verify="required" required/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">应用名称</label>
            <div class="layui-input-block">
                <input name="clientName" placeholder="请输入应用名称" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">应用密钥</label>
            <div class="layui-input-block">
                <input name="clientSecretStr" placeholder="请输入应用密钥" type="text" class="layui-input" maxlength="20"
                       lay-verify="required" required />
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">回调地址</label>
            <div class="layui-input-block">
                <input name="webServerRedirectUri" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item model-form-footer">
            <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
            <button class="layui-btn" lay-filter="app-form-submit" lay-submit>保存</button>
        </div>
    </form>
</script> -->


<script>
    layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin'], function () {
        var form = layui.form;
        var table = layui.table;
        var config = layui.config;
        var layer = layui.layer;
        var util = layui.util;
        var admin = layui.admin;

        //时间格式
        var laydate = layui.laydate;
        //执行一个laydate实例
        laydate.render({
            elem: '#test1' //指定元素
        });
        laydate.render({
            elem: '#test2' //指定元素
        });

        // 渲染表格
        table.render({
            elem: '#app-table',
            url: config.base_server + 'api-opration/dataneed',
            method: 'GET',
            headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
            page: true,
            cols: [[
                { type: 'numbers' },
                { field: 'doctorName', width: 180, sort: true, title: '医生姓名' },
                { field: 'doctorTel', width: 200, sort: true, title: '联系电话' },
                { field: 'hospitalName', width: 180, sort: true, title: '所在医院' },
                { field: 'needBegintime',width: 300, sort: true, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy年MM月dd日 HH:mm:ss')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
                { field: 'needType', width: 250, sort: true, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
                { field: 'needTags', width: 250, sort: true, title: '需求标签' },
                { field: 'enabled', width: 250, sort: true, title: '处理状态', templet: function (d) { if (d.enabled == 1) { return '已上传' } else { return '未处理' } } },
                { field: 'downTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" }
            ]]
        });

        // 工具条点击事件
        table.on('tool(app-table)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;

            if (layEvent === 'del') { // 删除
                doDelete(obj);
            } else if (layEvent === 'edit') { //修改
                showEditModel(data);
            }
        });


        // // 删除
        // var doDelete = function (obj) {
        //     layer.confirm('确定要删除吗？', function (i) {
        //         layer.close(i);
        //         layer.load(2);
        //         admin.req('api-opration/dataneed/' + obj.data.id, {}, function (data) {
        //             layer.closeAll('loading');
        //             layer.msg('成功', { icon: 1, time: 500 });
        //             obj.del();
        //         }, 'DELETE');
        //     });
        // };

        // 搜索按钮点击事件
        $('#app-btn-search').click(function () {
            var key = $('#app-edit-search').val();
            var needBegintime = $('#test1').val();
            var needEndtime = $('#test2').val();
            if (needBegintime != null && needEndtime != null) {
                var flag=compareDate(needBegintime, needEndtime);
                if(!flag){
                    layer.msg('结束时间不得小于开始时间');
                    return;
                }
            }
            
            table.reload('app-table', { where: { doctorName: key,needBegintime:needBegintime, needEndtime:needEndtime} });
        });
        //比较日期大小
        function compareDate(logintime, logouttime) {
            var arys1 = new Array();
            var arys2 = new Array();
            if (logintime != null && logouttime != null) {
                arys1 = logintime.split('-');
                var logindate = new Date(arys1[0], parseInt(arys1[1] - 1), arys1[2]);
                arys2 = logouttime.split('-');
                var logoutdate = new Date(arys2[0], parseInt(arys2[1] - 1), arys2[2]);
                if (logindate > logoutdate) {
                    return false;
                } else {
                    return true;
                }
            }
        }


        // 添加按钮点击事件
        $('#app-btn-add').click(function () {
            showEditModel();
        });

        // // 显示编辑弹窗
        // var showEditModel = function (data) {
        //     layer.open({
        //         type: 1,
        //         title: data ? '修改应用' : '添加应用',
        //         area: '450px',
        //         offset: '120px',
        //         content: $('#app-model').html(),
        //         success: function () {
        //             $('#app-form')[0].reset();
        //             $('#app-form').attr('method', 'POST');
        //             if (data) {
        //                 $("input[name='clientId']").attr('disabled', true);
        //                 $("input[name='clientId']").attr('class', "layui-input layui-disabled");
        //                 $("input[name='webServerRedirectUri']").attr('disabled', true);
        //                 $("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
        //                 form.val('app-form', data);
        //                 $('#app-form').attr('method', 'POST');
        //             }
        //         }
        //     });
        // };

        // // 表单提交事件
        // form.on('submit(app-form-submit)', function (data) {
        //     layer.load(2);
        //     admin.req('api-opration/dataneed/saveOrUpdate', JSON.stringify(data.field), function (data) {
        //         layer.closeAll('loading');
        //         console.log(data);
        //         if (data.code == 0) {
        //             layer.msg(data.msg, { icon: 1, time: 500 });
        //             table.reload('app-table');
        //             layer.closeAll('page');
        //         } else {
        //             layer.msg(data.msg, { icon: 2, time: 500 });
        //         }
        //     }, $('#app-form').attr('method'));
        //     return false;
        // });
    });
</script>