From a6e07e4a32ba8a01c9f7ba5c30b638a925c65d46 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 02 Apr 2020 17:58:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml | 83 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml | 1
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 211 ++++++++++
kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml | 47 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml | 71 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml | 87 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml | 91 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 83 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml | 79 ++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml | 59 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml | 47 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml | 75 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml | 67 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml | 97 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml | 47 +-
16 files changed, 699 insertions(+), 448 deletions(-)
diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
index 4b3de8c..7bec783 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
+++ b/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 !=''">
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
index 1aab2ad..b056ced 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
+++ b/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">
*
@@ -12,69 +12,72 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.recordTitle != null and p.recordTitle !=''">
- and record_title = #{p.recordTitle}
+ <if test="p.recordTitle != null and p.recordTitle !=''">
+ and record_title = #{p.recordTitle}
</if>
- <if test="p.userId != null and p.userId !=''">
- and user_id = #{p.userId}
+ <if test="p.userId != null and p.userId !=''">
+ and user_id = #{p.userId}
</if>
- <if test="p.userName != null and p.userName !=''">
- and user_name = #{p.userName}
+ <if test="p.userName != null and p.userName !=''">
+ and user_name = #{p.userName}
</if>
- <if test="p.appId != null and p.appId !=''">
- and app_id = #{p.appId}
+ <if test="p.appId != null and p.appId !=''">
+ and app_id = #{p.appId}
</if>
- <if test="p.appName != null and p.appName !=''">
- and app_name = #{p.appName}
+ <if test="p.appName != null and p.appName !=''">
+ and app_name = #{p.appName}
</if>
- <if test="p.recordIp != null and p.recordIp !=''">
- and record_ip = #{p.recordIp}
+ <if test="p.recordIp != null and p.recordIp !=''">
+ and record_ip = #{p.recordIp}
</if>
- <if test="p.recordDetail != null and p.recordDetail !=''">
- and record_detail = #{p.recordDetail}
+ <if test="p.recordDetail != null and p.recordDetail !=''">
+ and record_detail = #{p.recordDetail}
</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.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>
<!--定义根据-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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
index 6bb3b8b..e496315 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
+++ b/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">
*
@@ -12,63 +12,66 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.departmentId != null and p.departmentId !=''">
- and department_id = #{p.departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</if>
- <if test="p.doctorCount != null and p.doctorCount !=''">
- and doctor_count = #{p.doctorCount}
+ <if test="p.doctorCount != null and p.doctorCount !=''">
+ and doctor_count = #{p.doctorCount}
</if>
- <if test="p.serverEndDate != null and p.serverEndDate !=''">
- and server_end_date = #{p.serverEndDate}
+ <if test="p.serverEndDate != null and p.serverEndDate !=''">
+ and server_end_date = #{p.serverEndDate}
</if>
- <if test="p.totalRayCount != null and p.totalRayCount !=''">
- and total_ray_count = #{p.totalRayCount}
+ <if test="p.totalRayCount != null and p.totalRayCount !=''">
+ and total_ray_count = #{p.totalRayCount}
</if>
- <if test="p.totalRecordCount != null and p.totalRecordCount !=''">
- and total_record_count = #{p.totalRecordCount}
+ <if test="p.totalRecordCount != null and p.totalRecordCount !=''">
+ and total_record_count = #{p.totalRecordCount}
</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>
- <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.tenantId != null and p.tenantId !=''">
- and tenant_id = #{p.tenantId}
+ <if test="p.tenantId != null and p.tenantId !=''">
+ and tenant_id = #{p.tenantId}
</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>
- </where>
+ </where>
</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>
\ No newline at end of file
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
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
index 5ea012d..6bda2a5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
+++ b/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">
*
@@ -12,45 +12,48 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <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>
- <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.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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
index 17e6914..c00ed0b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
+++ b/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">
*
@@ -12,54 +12,57 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.isAnswer != null and p.isAnswer !=''">
- and is_answer = #{p.isAnswer}
+ <if test="p.isAnswer != null and p.isAnswer !=''">
+ and is_answer = #{p.isAnswer}
</if>
- <if test="p.isSigning != null and p.isSigning !=''">
- and is_signing = #{p.isSigning}
+ <if test="p.isSigning != null and p.isSigning !=''">
+ and is_signing = #{p.isSigning}
</if>
- <if test="p.doctorState != null and p.doctorState !=''">
- and doctor_state = #{p.doctorState}
+ <if test="p.doctorState != null and p.doctorState !=''">
+ and doctor_state = #{p.doctorState}
</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>
- <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.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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
index e8d9ab7..d16dcce 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
+++ b/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">
*
@@ -12,45 +12,48 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <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>
- <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.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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
index 3f0d6fb..d151483 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
+++ b/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">
*
@@ -12,78 +12,81 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.hospitalId != null and p.hospitalId !=''">
- and hospital_id = #{p.hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</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.departmentId != null and p.departmentId !=''">
- and department_id = #{p.departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</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.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 = #{p.doctorName}
</if>
- <if test="p.publicType != null and p.publicType !=''">
- and public_type = #{p.publicType}
+ <if test="p.publicType != null and p.publicType !=''">
+ and public_type = #{p.publicType}
</if>
- <if test="p.templeteType != null and p.templeteType !=''">
- and templete_type = #{p.templeteType}
+ <if test="p.templeteType != null and p.templeteType !=''">
+ and templete_type = #{p.templeteType}
</if>
- <if test="p.templeteTitle != null and p.templeteTitle !=''">
- and templete_title = #{p.templeteTitle}
+ <if test="p.templeteTitle != null and p.templeteTitle !=''">
+ and templete_title = #{p.templeteTitle}
</if>
- <if test="p.templeteNote != null and p.templeteNote !=''">
- and templete_note = #{p.templeteNote}
+ <if test="p.templeteNote != null and p.templeteNote !=''">
+ and templete_note = #{p.templeteNote}
</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.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.updateTime != null and p.updateTime !=''">
- and update_time = #{p.updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
index 154bc8b..a17426a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
+++ b/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">
*
@@ -12,60 +12,63 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.hospitalId != null and p.hospitalId !=''">
- and hospital_id = #{p.hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</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.hospitalLogo != null and p.hospitalLogo !=''">
- and hospital_logo = #{p.hospitalLogo}
+ <if test="p.hospitalLogo != null and p.hospitalLogo !=''">
+ and hospital_logo = #{p.hospitalLogo}
</if>
- <if test="p.hospitalQrImage != null and p.hospitalQrImage !=''">
- and hospital_qr_image = #{p.hospitalQrImage}
+ <if test="p.hospitalQrImage != null and p.hospitalQrImage !=''">
+ and hospital_qr_image = #{p.hospitalQrImage}
</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>
- <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.tenantId != null and p.tenantId !=''">
- and tenant_id = #{p.tenantId}
+ <if test="p.tenantId != null and p.tenantId !=''">
+ and tenant_id = #{p.tenantId}
</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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 7fe0438..6a0222c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/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">
*
@@ -12,72 +12,75 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.orderId != null and p.orderId !=''">
- and order_id = #{p.orderId}
+ <if test="p.orderId != null and p.orderId !=''">
+ and order_id = #{p.orderId}
</if>
- <if test="p.proId != null and p.proId !=''">
- and pro_id = #{p.proId}
+ <if test="p.proId != null and p.proId !=''">
+ and pro_id = #{p.proId}
</if>
- <if test="p.proName != null and p.proName !=''">
- and pro_name = #{p.proName}
+ <if test="p.proName != null and p.proName !=''">
+ and pro_name = #{p.proName}
</if>
- <if test="p.isShare != null and p.isShare !=''">
- and is_share = #{p.isShare}
+ <if test="p.isShare != null and p.isShare !=''">
+ and is_share = #{p.isShare}
</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.ailightCount != null and p.ailightCount !=''">
- and ailight_count = #{p.ailightCount}
+ <if test="p.ailightCount != null and p.ailightCount !=''">
+ and ailight_count = #{p.ailightCount}
</if>
- <if test="p.recordCount != null and p.recordCount !=''">
- and record_count = #{p.recordCount}
+ <if test="p.recordCount != null and p.recordCount !=''">
+ and record_count = #{p.recordCount}
</if>
- <if test="p.proBegintime != null and p.proBegintime !=''">
- and pro_begintime = #{p.proBegintime}
+ <if test="p.proBegintime != null and p.proBegintime !=''">
+ and pro_begintime = #{p.proBegintime}
</if>
- <if test="p.proEndtime != null and p.proEndtime !=''">
- and pro_endtime = #{p.proEndtime}
+ <if test="p.proEndtime != null and p.proEndtime !=''">
+ and pro_endtime = #{p.proEndtime}
</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.updateTime != null and p.updateTime !=''">
- and update_time = #{p.updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
index b14cfae..df12aa3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
+++ b/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">
*
@@ -12,75 +12,78 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.hospitalId != null and p.hospitalId !=''">
- and hospital_id = #{p.hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</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.departmentId != null and p.departmentId !=''">
- and department_id = #{p.departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</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.contractNo != null and p.contractNo !=''">
- and contract_no = #{p.contractNo}
+ <if test="p.contractNo != null and p.contractNo !=''">
+ and contract_no = #{p.contractNo}
</if>
- <if test="p.contractTitle != null and p.contractTitle !=''">
- and contract_title = #{p.contractTitle}
+ <if test="p.contractTitle != null and p.contractTitle !=''">
+ and contract_title = #{p.contractTitle}
</if>
- <if test="p.contractBeginTime != null and p.contractBeginTime !=''">
- and contract_begin_time = #{p.contractBeginTime}
+ <if test="p.contractBeginTime != null and p.contractBeginTime !=''">
+ and contract_begin_time = #{p.contractBeginTime}
</if>
- <if test="p.contractEndTime != null and p.contractEndTime !=''">
- and contract_end_time = #{p.contractEndTime}
+ <if test="p.contractEndTime != null and p.contractEndTime !=''">
+ and contract_end_time = #{p.contractEndTime}
</if>
- <if test="p.contractTime != null and p.contractTime !=''">
- and contract_time = #{p.contractTime}
+ <if test="p.contractTime != null and p.contractTime !=''">
+ and contract_time = #{p.contractTime}
</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.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.updateTime != null and p.updateTime !=''">
- and update_time = #{p.updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</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>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
index 5666730..3931088 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
+++ b/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">
*
@@ -12,72 +12,75 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</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 = #{p.doctorName}
</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.departmentId != null and p.departmentId !=''">
- and department_id = #{p.departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</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.hospitalId != null and p.hospitalId !=''">
- and hospital_id = #{p.hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</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.feedbackNote != null and p.feedbackNote !=''">
- and feedback_note = #{p.feedbackNote}
+ <if test="p.feedbackNote != null and p.feedbackNote !=''">
+ and feedback_note = #{p.feedbackNote}
</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.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>
<!--定义根据-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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
index a778dec..29e4dc1 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
+++ b/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">
*
@@ -12,45 +12,48 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.applicationName != null and p.applicationName !=''">
- and application_name = #{p.applicationName}
+ <if test="p.applicationName != null and p.applicationName !=''">
+ and application_name = #{p.applicationName}
</if>
- <if test="p.className != null and p.className !=''">
- and class_name = #{p.className}
+ <if test="p.className != null and p.className !=''">
+ and class_name = #{p.className}
</if>
- <if test="p.methodName != null and p.methodName !=''">
- and method_name = #{p.methodName}
+ <if test="p.methodName != null and p.methodName !=''">
+ and method_name = #{p.methodName}
</if>
- <if test="p.userId != null and p.userId !=''">
- and user_id = #{p.userId}
+ <if test="p.userId != null and p.userId !=''">
+ and user_id = #{p.userId}
</if>
- <if test="p.userName != null and p.userName !=''">
- and user_name = #{p.userName}
+ <if test="p.userName != null and p.userName !=''">
+ and user_name = #{p.userName}
</if>
- <if test="p.clientId != null and p.clientId !=''">
- and client_id = #{p.clientId}
+ <if test="p.clientId != null and p.clientId !=''">
+ and client_id = #{p.clientId}
</if>
- <if test="p.operation != null and p.operation !=''">
- and operation = #{p.operation}
+ <if test="p.operation != null and p.operation !=''">
+ and operation = #{p.operation}
</if>
- <if test="p.timestamp != null and p.timestamp !=''">
- and timestamp = #{p.timestamp}
+ <if test="p.timestamp != null and p.timestamp !=''">
+ and timestamp = #{p.timestamp}
</if>
- </where>
+ </where>
</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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 3ff4d14..1bc902e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/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">
*
@@ -12,66 +12,69 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.proName != null and p.proName !=''">
- and pro_name = #{p.proName}
+ <if test="p.proName != null and p.proName !=''">
+ and pro_name = #{p.proName}
</if>
- <if test="p.proTime != null and p.proTime !=''">
- and pro_time = #{p.proTime}
+ <if test="p.proTime != null and p.proTime !=''">
+ and pro_time = #{p.proTime}
</if>
- <if test="p.proType != null and p.proType !=''">
- and pro_type = #{p.proType}
+ <if test="p.proType != null and p.proType !=''">
+ and pro_type = #{p.proType}
</if>
- <if test="p.proPrice != null and p.proPrice !=''">
- and pro_price = #{p.proPrice}
+ <if test="p.proPrice != null and p.proPrice !=''">
+ and pro_price = #{p.proPrice}
</if>
- <if test="p.recordCount != null and p.recordCount !=''">
- and record_count = #{p.recordCount}
+ <if test="p.recordCount != null and p.recordCount !=''">
+ and record_count = #{p.recordCount}
</if>
- <if test="p.ailightCount != null and p.ailightCount !=''">
- and ailight_count = #{p.ailightCount}
+ <if test="p.ailightCount != null and p.ailightCount !=''">
+ and ailight_count = #{p.ailightCount}
</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.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>
<!--定义根据-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>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
index 023de49..f74a33a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
+++ b/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
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
new file mode 100644
index 0000000..f20cb2e
--- /dev/null
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -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="输入医生姓名" /> 
+ <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
+ class="layui-input search-input" id="test2">  
+ <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> -->
+ <button id="app-btn-export" class="layui-btn icon-btn"><i class="layui-icon"></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>
\ No newline at end of file
--
Gitblit v1.8.0