From f96ad6ec73b3da7df5c08471f0d567d46fc767e8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 14:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 108 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
index 10b0853..d64c91f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -3,39 +3,79 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.matrix.system.activity.dao.ActivitySignReceiveRecordDao">
- <!-- 定义ActivitySignReceiveRecord 的复杂关联map -->
- <resultMap type="com.matrix.system.activity.entity.ActivitySignReceiveRecord" id="ActivitySignReceiveRecordMap">
- <id property="id" column="id" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="openId" column="open_id" />
- <result property="receiveTime" column="receive_time" />
- <result property="remark" column="remark" />
- <result property="awardId" column="award_id" />
- <result property="state" column="state" />
- <result property="writeOffCode" column="write_off_code" />
- <result property="activityId" column="activity_id" />
- <result property="companyId" column="company_id" />
- </resultMap>
-
-
- <!-- 定义ActivitySignReceiveRecord 的简单map ，本map不添加其他的关联属性 -->
- <resultMap type="com.matrix.system.activity.entity.ActivitySignReceiveRecord" id="ActivitySignReceiveRecordSimpleMap">
- <id property="id" column="id" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="openId" column="open_id" />
- <result property="receiveTime" column="receive_time" />
- <result property="remark" column="remark" />
- <result property="awardId" column="award_id" />
- <result property="state" column="state" />
- <result property="writeOffCode" column="write_off_code" />
- <result property="activityId" column="activity_id" />
- <result property="companyId" column="company_id" />
- </resultMap>
+
+
+ <select id="findSignReceiveList" resultType="com.matrix.system.activity.vo.SignReceiveListVo">
+ SELECT
+ a.id id,
+ b.nick_name nickName,
+ a.receive_time reciveTime,
+ a.state,
+ c.cumulative_day cumulativeDay,
+ c.award_type awardType,
+ c.award_name awardName,
+ c.award_rule awardRule
+ FROM
+ activity_sign_receive_record a
+ LEFT JOIN biz_user b ON a.user_id = b.user_id
+ LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
+ <where>
+ a.company_id = #{record.companyId}
+ and a.activity_id = #{record.actId}
+ <if test="record.yhmc != null and record.yhmc != ''">
+ and b.nick_name like concat('%',#{record.yhmc},'%')
+ </if>
+ <if test="record.startTime != null ">
+ and a.receive_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null">
+ and #{record.endTime} >= a.receive_time
+ </if>
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ </select>
+
+ <select id="selectCouponList" resultType="com.matrix.system.activity.vo.CouponVo">
+ SELECT
+ a.id id,
+ a.c_name cName,
+ a.end_time endTime
+ FROM
+ shop_coupon a
+ <where>
+ a.company_id = #{record.companyId}
+ <if test="record.yhjmc != null and record.yhjmc != ''">
+ and a.c_name like concat('%',#{record.yhjmc},'%')
+ </if>
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ </select>
+
+ <select id="selectGoodsList" resultType="com.matrix.system.activity.vo.GoodsVo">
+ SELECT
+ a.id id,
+ a.name name,
+ a.good_type goodType,
+ a.code code,
+ a.seal_pice sealPice
+ FROM
+ shopping_goods a
+ <where>
+ a.company_id = #{record.companyId}
+ <if test="record.cpmc != null and record.cpmc != ''">
+ and a.name like concat('%',#{record.cpmc},'%')
+ </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