From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 0eeaf0f..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
@@ -87,7 +90,15 @@
FROM
activity_sign_receive_record a
left join biz_user b on a.user_id= b.user_id
- where a.user_id = #{userId} and a.id = #{receiveId}
+ 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