From ea9f73babda708e281f08f82aa099a0a128a24d5 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Tue, 08 Dec 2020 19:34:56 +0800
Subject: [PATCH] 新增合作商管理、合作商客户管理模块
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 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 892860e..d70c2e3 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">
@@ -170,8 +170,9 @@
<include refid="whereforall"/>
order by
DE.pro_endtime ASC,
+ DE.ailight_count ASC,
DE.pro_begintime ASC,
- DE.id asc
+ DE.id ASC
</select>
<select id="getEnabledCount" resultType="int" parameterType="long">
@@ -260,11 +261,47 @@
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
+ <if test="enabled!=null">
+ and enabled=#{enabled}
+ </if>
+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,
--
Gitblit v1.8.0