From fc223b26f87f7a221b38084bb62d8047974bbf1c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 12:42:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 deletions(-)
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..9f33dac 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">
*
@@ -11,70 +11,80 @@
<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.recordTitle != null and p.recordTitle !=''">
- and record_title = #{p.recordTitle}
+ <if test="p.recordTitle != null and p.recordTitle !=''">
+ and record_title like '%${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.startTime!= null and p.startTime !=''">
+ and create_time >= #{p.startTime}
</if>
- </where>
+ <if test="p.endTime!= null and p.endTime !=''">
+ and create_time <= #{p.endTime}
+ </if>
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
+ </if>
+ </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
+ limit 1
</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
--
Gitblit v1.8.0