From 1bb79a70a9e4f0046a66a72ec399fa66bc07af02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Nov 2021 11:18:41 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
index 716911e..4ad1d1f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -213,6 +213,13 @@
 			<if test="record.actName != null and record.actName != '' ">
 				act_name  = #{record.actName},
 			</if>
+			<if test="record.actCode != null ">
+				act_code  = #{record.actCode},
+			</if>
+
+			<if test="record.actContent != null ">
+				act_content  = #{record.actContent},
+			</if>
 			<if test="record.actType != null ">
 				act_type  = #{record.actType}, 
 			</if>
@@ -410,4 +417,26 @@
 			a.${record.sort} ${record.order}
 		</if>
 	</select>
+
+	<select id="selectOneByCompanyIdAndActTypeAndActStatus" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
+		SELECT
+		*
+		FROM
+		shop_activities a
+		where
+			a.company_id=#{companyId}
+			and a.act_type=#{activitiesTypeSign}
+			and a.act_status=#{actstatusStatusIng}
+	</select>
+
+	<select id="selectOneByCompanyIdAndActType" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
+		SELECT
+			*
+		FROM
+			shop_activities a
+		where
+			a.company_id=#{companyId}
+		  and a.act_type=#{activitiesTypeSign}
+		  and a.act_status != 5
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1