From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml
new file mode 100644
index 0000000..6d8b000
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.activity.dao.ActivitySignAwardSetDao">
+
+	<select id="selectListByActIDAndCompanyId" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo">
+		SELECT
+			*
+		FROM
+			activity_sign_award_set a
+		where
+			a.activity_id = #{actId}
+		  and a.company_id = #{companyId}
+		  and a.award_state = #{awardState}
+	</select>
+
+	<select id="selectListByActIDAndCompanyIdAndAwardType" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo">
+		SELECT
+			*
+		FROM
+			activity_sign_award_set a
+		where
+			a.activity_id = #{actId}
+		  and a.company_id = #{companyId}
+		  and a.award_state = #{awardState}
+		  and a.award_rule = #{awardRule}
+	</select>
+
+	<select id="selectActivitySignAwardSetByActIDAndCompanyIdAndAwardType" resultType="com.matrix.system.activity.entity.ActivitySignAwardSet">
+		SELECT
+			*
+		FROM
+			activity_sign_award_set a
+		where
+			a.activity_id = #{actId}
+		  and a.company_id = #{companyId}
+		  and a.award_state = #{awardState}
+		  and a.award_rule = #{awardRule}
+	</select>
+
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.1