From 5d971aadea398a175e50b32371afb037d16b4bf7 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:18:46 +0800
Subject: [PATCH] 1.用户注册,消费记录,续费记录,添加用户,重置密码,设为管理员接口增加 2.修改管理后台关联的改动。

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml |   64 +++++++++++++++++++------------
 1 files changed, 39 insertions(+), 25 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 8f53461..6112286 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
@@ -65,7 +65,6 @@
             </if>
         </where>
     </sql>
-
     <!--定义根据-ProductOrderDetail当作查询条件返回对象-->
     <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
         select
@@ -116,30 +115,6 @@
             <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
         </where>
     </sql>
-    <!--查询产品的消费记录-->
-    <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail">
-        SELECT
-        DE.id,
-        DE.ailight_count,
-        DE.order_id,
-        DE.pro_name,
-        DE.record_count,
-        DE.is_share,
-        DE.pro_begintime,
-        DE.pro_endtime,
-        DE.pro_id,
-        DE.create_time,
-        DE.is_del,
-        DE.enabled,
-        PRO.hospital_name,
-        PRO.department_name,
-        DE.pro_type
-        FROM
-        product_order_detail DE
-        LEFT JOIN product_order PRO ON DE.order_id = PRO.id
-        <include refid="wherelimit"/>
-        order by DE.id desc
-    </select>
     <select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
         select
         COUNT(DE.pro_id) pro_count,
@@ -166,4 +141,43 @@
         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 &lt;=now() and DE.pro_endtime >=now() and DE.enabled=1
+            <if test="p.recordCount != null and p.recordCount !=''">
+                and DE.record_count > #{p.recordCount}
+            </if>
+            <if test="p.hospitalId != null and p.hospitalId !=''">
+                and DE.hospital_id = #{p.hospitalId}
+            </if>
+        </where>
+    </sql>
+    <!--查询产品的购买记录-->
+    <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail">
+        SELECT
+        DE.id,
+        DE.ailight_count,
+        DE.order_id,
+        DE.pro_name,
+        DE.record_count,
+        DE.is_share,
+        DE.pro_begintime,
+        DE.pro_endtime,
+        DE.pro_id,
+        DE.create_time,
+        DE.is_del,
+        DE.enabled,
+        PRO.hospital_Id,
+        PRO.hospital_name,
+        PRO.department_id,
+        PRO.department_name,
+        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