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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 c80ed2f..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,9 +261,10 @@
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
--
Gitblit v1.8.0