From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 102 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 4 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 62b425d..c419e42 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
@@ -112,7 +112,7 @@
<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>
+<!-- <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>-->
</where>
</sql>
<select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
@@ -145,7 +145,7 @@
<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.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}
@@ -261,7 +261,101 @@
order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 )
AND is_del = 0
AND enabled = 1
-ORDER BY
- create_time DESC
+ORDER BY id DESC
+ </select>
+ <select id="getUserdProduct" resultType="int">
+ SELECT
+ sum(total)
+ FROM
+ (
+ SELECT
+ count(*) total
+ FROM
+ `product_order` order_order
+ LEFT JOIN product_order_record record ON order_order.id = record.order_id
+ WHERE
+ order_order.hospital_id = #{hospitalId}
+ AND order_order.department_id = #{departmentId}
+ and record.pro_id!=1000000000000000000
+ AND order_order.is_del = 0
+ AND order_order.enabled = 1
+ AND record.is_del = 0
+ AND record.enabled = 1
+ AND record.pro_endtime>now()
+ UNION ALL
+ SELECT
+ count(*) total
+ FROM
+ `product_order` order_order
+ LEFT JOIN product_order_record record ON order_order.id = record.order_id
+ WHERE
+ order_order.hospital_id = #{hospitalId}
+ AND record.is_share = 1
+ and record.pro_id!=1000000000000000000
+ AND order_order.is_del = 0
+ AND order_order.enabled = 1
+ AND record.is_del = 0
+ AND record.enabled = 1
+ AND record.pro_endtime>now()
+ ) cc
+ </select>
+ <select id="productEndList" resultType="com.kidgrow.oprationcenter.vo.ProductEndVo">
+ SELECT
+ id,
+ pro_id,
+ pro_begintime beginTime,
+ MIN( T2.pro_endtime ) endTime,
+ MIN( T2.ailight_count ) ailight_count,
+ pro_type,
+ pro_name,
+ T2.hospital_id,
+ hospital_name,
+ T2.department_id,
+ department_name
+ FROM
+ (
+ SELECT
+ details.id id,
+ details.pro_id,
+ details.pro_begintime pro_begintime,
+ details.pro_endtime pro_endtime,
+ details.ailight_count,
+ details.pro_name pro_name,
+ details.pro_type pro_type,
+ orders.hospital_id hospital_id,
+ orders.hospital_name hospital_name,
+ orders.department_id department_id,
+ orders.department_name department_name
+ FROM
+ product_order_detail details
+ LEFT JOIN product_order orders ON orders.id = details.order_id
+ WHERE
+ details.is_del = 0
+ AND details.enabled = 1
+ AND orders.is_del = 0
+ AND orders.enabled = 1
+ AND pro_endtime BETWEEN now() AND DATE_ADD(NOW(), INTERVAL ${monthPar} MONTH)
+ AND ailight_count BETWEEN 1 AND ${aiCountPar}
+ AND pro_type=1
+ ORDER BY
+ ailight_count,
+ pro_endtime
+ ) AS T2
+ GROUP BY
+ department_id,
+ hospital_id,
+ department_name,
+ hospital_name,
+ id,
+ pro_id,
+ pro_type,
+ pro_name,
+ ailight_count,
+ pro_endtime,
+ pro_begintime
+ ORDER BY
+ ailight_count,
+ pro_endtime,
+ department_id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0