From 785994b056124cea63120ba6b592a0d277f70075 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 12 Apr 2021 18:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml | 11 +++++++++++
1 files changed, 11 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..2a3fa33 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,12 @@
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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1