From d13ae240c54c59b04c0571bfc0136ed0c8ba32a3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 14 Jul 2021 14:16:06 +0800
Subject: [PATCH] 修复bug
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 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..4ad1d1f 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},
@@ -208,6 +212,13 @@
<set>
<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},
@@ -386,4 +397,46 @@
</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>
+
+ <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