From c58a42aa1acc821e0c3e748de7205e58af6c350b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 01 Sep 2020 16:44:25 +0800
Subject: [PATCH] 1.修改充值页面,可支持修改起始结束时间 2.修改添加医院/医生页面,增加自动选择当前服务/销售人员 3.调整页面部分显示细节问题
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
index 61f1ac4..d0898fe 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
@@ -12,8 +12,8 @@
<where>
<!--查询条件自行添加-->
1=1
- <if test="p.recordId != null and p.recordId !=''">
- and record_id = #{p.recordId}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
<if test="p.lastRecordId != null and p.lastRecordId !=''">
and last_record_id = #{p.lastRecordId}
@@ -48,7 +48,7 @@
<include refid="Column_List"/>
from consumption_record
<include refid="where"/>
- order by record_id desc
+ order by id desc
limit 1
</select>
@@ -58,6 +58,19 @@
<include refid="Column_List"/>
from consumption_record
<include refid="where"/>
- order by record_id desc
+ order by id desc
+ </select>
+ <!--定义根据-ConsumptionRecord当作查询条件返回对象集合-->
+ <select id="findDetailList" resultType="com.kidgrow.oprationcenter.model.ConsumptionRecord">
+ SELECT * FROM `consumption_record`
+ where record_type=1
+ and update_time is null
+ <if test="DetailList!=null and DetailList.size()>0">
+ and pro_order_detail_id in
+ <foreach item="item" index="index" collection="DetailList" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0