From 0930a9b75df70289da7188ba65b183e012a9d692 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 22 Jul 2020 15:50:44 +0800
Subject: [PATCH] 数据去重 医院端修改添加组织
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 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 1bcdb59..b22f059 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
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
@@ -65,7 +65,6 @@
</if>
</where>
</sql>
-
<!--定义根据-ProductOrderDetail当作查询条件返回对象-->
<select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
select
@@ -93,7 +92,10 @@
and id = #{p.id}
</if>
<if test="p.proType != null and p.proType !=''">
- and pro_type = #{p.proType}
+ and DE.pro_type = #{p.proType}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and DE.enabled = #{p.enabled}
</if>
<if test="p.hospitalName != null and p.hospitalName !=''">
and PRO.hospital_name like concat ('%',#{p.hospitalName},'%')
@@ -113,30 +115,6 @@
<include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
</where>
</sql>
- <!--查询产品的消费记录-->
- <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail">
- 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_name,
- PRO.department_name,
- DE.pro_type
- FROM
- product_order_detail DE
- LEFT JOIN product_order PRO ON DE.order_id = PRO.id
- <include refid="wherelimit"/>
- order by DE.id desc
- </select>
<select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
select
COUNT(DE.pro_id) pro_count,
@@ -163,4 +141,32 @@
ORDER BY
pod.pro_type desc,pod.pro_endtime desc
</select>
+ <!--sql查询片段-->
+ <sql id="whereforall">
+ <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.hospitalId != null and p.hospitalId !=''">
+ and PRO.hospital_id = #{p.hospitalId}
+ </if>
+ </where>
+ </sql>
+ <!--查询产品的购买记录-->
+ <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail">
+ SELECT
+ DE.id,
+ DE.ailight_count,
+ DE.record_count,
+ DE.is_share,
+ DE.pro_begintime,
+ DE.pro_endtime,
+ PRO.hospital_Id,
+ PRO.department_id,
+ DE.pro_type
+ FROM
+ product_order_detail DE
+ LEFT JOIN product_order PRO ON DE.order_id = PRO.id
+ <include refid="whereforall"/>
+ order by DE.pro_endtime asc,DE.id asc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0