From a411a7673a32016de54ee0b95083951a549e89b0 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 20 Apr 2021 11:51:12 +0800 Subject: [PATCH] 20210420 签到 --- zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml index 30f587b..0d3affe 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml @@ -73,6 +73,9 @@ <if test="record.zjzxm != null and record.zjzxm != ''"> and b.nick_name like concat('%',#{record.zjzxm},'%') </if> + <if test="record.hdmcbm != null and record.hdmcbm != ''"> + and (c.act_name like concat('%',#{record.hdmcbm},'%') or c.act_code like concat('%',#{record.hdmcbm},'%')) + </if> </where> <if test="record.sort !=null"> order by @@ -90,4 +93,20 @@ where a.user_id = #{userId} and a.award_id = #{receiveId} </select> + <select id="selectShopDeliveryInfoByLogisticsId" resultType="com.matrix.system.shopXcx.bean.ShopDeliveryInfo"> + SELECT + * + FROM + shop_delivery_info a + where a.id = #{logisticsId} + </select> + + <select id="selectActivitySignWriteoffByUserIDAndReceiveId" resultType="com.matrix.system.activity.entity.ActivitySignWriteoff"> + SELECT + * + FROM + shop_delivery_info a + where a.id = #{logisticsId} + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.1