From 81aaee286ba7f54ef1b713fedd6d24a9294745df Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 02 Apr 2020 14:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
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 6035955..b14cfae 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.oprationcenter.mapper.ProductOrderMapper">
+<mapper namespace="com.kidgrow.usercenter.mapper.ProductOrderMapper">
<!--定义查询列-->
<sql id="Column_List">
*
@@ -11,66 +11,66 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ p.is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="hospitalId != null and hospitalId !=''">
- and hospital_id = #{hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</if>
- <if test="hospitalName != null and hospitalName !=''">
- and hospital_name = #{hospitalName}
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name = #{p.hospitalName}
</if>
- <if test="departmentId != null and departmentId !=''">
- and department_id = #{departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</if>
- <if test="departmentName != null and departmentName !=''">
- and department_name = #{departmentName}
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
</if>
- <if test="contractNo != null and contractNo !=''">
- and contract_no = #{contractNo}
+ <if test="p.contractNo != null and p.contractNo !=''">
+ and contract_no = #{p.contractNo}
</if>
- <if test="contractTitle != null and contractTitle !=''">
- and contract_title = #{contractTitle}
+ <if test="p.contractTitle != null and p.contractTitle !=''">
+ and contract_title = #{p.contractTitle}
</if>
- <if test="contractBeginTime != null and contractBeginTime !=''">
- and contract_begin_time = #{contractBeginTime}
+ <if test="p.contractBeginTime != null and p.contractBeginTime !=''">
+ and contract_begin_time = #{p.contractBeginTime}
</if>
- <if test="contractEndTime != null and contractEndTime !=''">
- and contract_end_time = #{contractEndTime}
+ <if test="p.contractEndTime != null and p.contractEndTime !=''">
+ and contract_end_time = #{p.contractEndTime}
</if>
- <if test="contractTime != null and contractTime !=''">
- and contract_time = #{contractTime}
+ <if test="p.contractTime != null and p.contractTime !=''">
+ and contract_time = #{p.contractTime}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
</where>
</sql>
<!--定义根据-ProductOrder当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrder">
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.ProductOrder">
select <include refid="Column_List"/>
from product_order
<include refid="where"/>
@@ -78,7 +78,7 @@
</select>
<!--定义根据-ProductOrder当作查询条件返回对象集合-->
- <select id="findList" resultType="com.kidgrow.oprationcenter.model.ProductOrder">
+ <select id="findList" resultType="com.kidgrow.usercenter.model.ProductOrder">
select <include refid="Column_List"/>
from product_order
order by id desc
--
Gitblit v1.8.0