From 9a18aa1ec467a6bfbdf11f957f5c40e6326284cd Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 15 Sep 2020 11:53:33 +0800
Subject: [PATCH] 获取到期时间的接口，添加判断条件
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 e6fa3d0..14d010c 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
@@ -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}
@@ -168,7 +168,10 @@
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
+ order by
+ DE.pro_endtime ASC,
+ DE.pro_begintime ASC,
+ DE.id asc
</select>
<select id="getEnabledCount" resultType="int" parameterType="long">
@@ -193,7 +196,7 @@
</if>
<if test="datatype==1">
-- 套餐总量
- SELECT count(*) FROM product_order WHERE is_del=0 and enabled=1
+ SELECT count(*) FROM sys_product WHERE is_del=0 and enabled=1
</if>
<if test="datatype==2">
-- 未处理用户反馈
@@ -206,7 +209,7 @@
</select>
<select id="productOrderChart" resultType="com.kidgrow.oprationcenter.vo.OrderChartVo">
- <if test="p.units==1">
+ <if test="p.datatype==1">
-- 按年统计
SELECT COUNT(t.id) ccount,t.units FROM
(select id,DATE_FORMAT(contract_time,'%Y/%m') units,contract_time from product_order
@@ -214,7 +217,7 @@
) AS t
GROUP BY t.units
</if>
- <if test="p.units==2">
+ <if test="p.datatype==2">
-- 按月统计
SELECT COUNT(t.id) ccount,t.units FROM
(select id,DATE_FORMAT(contract_time,'%Y') units,contract_time from product_order
@@ -246,7 +249,19 @@
pro_id,
pro_name
ORDER BY
- procount DESC
+ ccount DESC
LIMIT 10
</select>
+ <select id="departmentProductDetail" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
+ SELECT
+ *
+FROM
+ product_order_detail
+WHERE
+ 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
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0