From d7a58eb17814af2a16ee13afaf93acda09745ed9 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 22 Jul 2020 22:10:35 +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/ProductOrderDetailMapper.xml | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
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 6112286..27594bd 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
@@ -146,11 +146,8 @@
<where>
<!--查询条件自行添加-->
DE.is_del=0 and DE.ailight_count>0 and DE.pro_begintime <=now() and DE.pro_endtime >=now() and DE.enabled=1
- <if test="p.recordCount != null and p.recordCount !=''">
- and DE.record_count > #{p.recordCount}
- </if>
<if test="p.hospitalId != null and p.hospitalId !=''">
- and DE.hospital_id = #{p.hospitalId}
+ and PRO.hospital_id = #{p.hospitalId}
</if>
</where>
</sql>
@@ -159,20 +156,12 @@
SELECT
DE.id,
DE.ailight_count,
- DE.order_id,
- DE.pro_name,
DE.record_count,
DE.is_share,
DE.pro_begintime,
DE.pro_endtime,
- DE.pro_id,
- DE.create_time,
- DE.is_del,
- DE.enabled,
PRO.hospital_Id,
- PRO.hospital_name,
PRO.department_id,
- PRO.department_name,
DE.pro_type
FROM
product_order_detail DE
--
Gitblit v1.8.0