From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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 | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 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 3553e0c..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
@@ -84,4 +83,90 @@
<include refid="where"/>
order by id desc
</select>
+ <!--sql查询片段-->
+ <sql id="wherelimit">
+ <where>
+ <!--查询条件自行添加-->
+ DE.is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.proType != null and 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},'%')
+ </if>
+ <if test="p.proName != null and p.proName !=''">
+ and DE.pro_name like concat ('%',#{p.proName},'%')
+ </if>
+ <if test="p.createTime != null and p.createTime !='' and p.updateTime != null and p.updateTime !=''">
+ and (DE.create_time between #{p.createTime} and #{p.updateTime})
+ </if>
+ <if test="p.startTime!= null and p.startTime !=''">
+ and DE.create_time >= #{p.startTime}
+ </if>
+ <if test="p.endTime!= null and p.endTime !=''">
+ and DE.create_time <= #{p.endTime}
+ </if>
+ <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
+ </where>
+ </sql>
+ <select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
+ select
+ COUNT(DE.pro_id) pro_count,
+ max(DE.pro_name) pro_name
+ from product_order_detail AS DE
+ <include refid="wherelimit"/>
+ GROUP BY DE.pro_id
+ order by pro_count desc
+ </select>
+ <select id="getTypeByUser" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail" parameterType="long">
+ SELECT
+ pod.*
+ FROM
+ `product_order` po
+ INNER JOIN product_order_detail pod ON po.id = pod.order_id
+ WHERE
+ po.hospital_id = #{id}
+ AND NOW() >= pod.pro_begintime
+ AND NOW() <=pod.pro_endtime
+ AND pod.enabled = 1
+ AND pod.is_del = 0
+ AND po.enabled = 1
+ AND po.is_del = 0
+ 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