From e2445003ce60e60b338cbf6ce837b60c2ee9adef Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:55:53 +0800
Subject: [PATCH] 修改头像

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 78a0c37..716911e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -7,6 +7,7 @@
 	<resultMap type="com.matrix.system.shopXcx.bean.ShopActivities" id="ShopActivitiesMap">
 		<id property="id" column="id" />
 			<result property="actName" column="act_name" />
+			<result property="actCode" column="act_code" />
 			<result property="actType" column="act_type" />
 			<result property="actBeginTime" column="act_begin_time" />
 			<result property="actEndTime" column="act_end_time" />
@@ -47,6 +48,7 @@
 	<resultMap type="com.matrix.system.shopXcx.bean.ShopActivities" id="ShopActivitiesSimpleMap">
 		<id property="id" column="id" />
 			<result property="actName" column="act_name" />
+			<result property="actCode" column="act_code" />
 			<result property="actType" column="act_type" />
 			<result property="actBeginTime" column="act_begin_time" />
 			<result property="actEndTime" column="act_end_time" />
@@ -65,6 +67,7 @@
 		update_time,
 			id,
 			act_name,
+			act_code,
 			act_type,
 			act_begin_time,
 			act_end_time,
@@ -85,6 +88,7 @@
 		now(),
 			#{item.id},
 			#{item.actName},
+			#{item.actCode},
 			#{item.actType},
 			#{item.actBeginTime},
 			#{item.actEndTime},
@@ -386,4 +390,24 @@
 			</if>
 		</if>
 	</select>
+
+	<select id="findActivitiesList" resultType="com.matrix.system.activity.vo.ActivitiesListVo">
+		SELECT
+			*
+		FROM
+		shop_activities a
+		<where>
+			a.company_id=#{record.companyId}
+			<if test="record.hdzt != null and record.hdzt != ''">
+				and a.act_status=#{record.hdzt}
+			</if>
+			<if test="record.hdmc != null and record.hdmc != ''">
+				and a.act_name like concat('%',#{record.hdmc},'%')
+			</if>
+		</where>
+		<if test="record.sort !=null">
+			order by
+			a.${record.sort} ${record.order}
+		</if>
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1