From 31037e96240c14bab943e73f341c259a8322a9a1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Mar 2021 19:46:52 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index 927d7f8..a621ad6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -53,7 +53,44 @@
biz_user a
WHERE
a.parent_open_id = #{openId}
- AND a.is_sales = 1
+ AND a.is_sales = #{isSales}
+ </select>
+
+ <select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
+ SELECT
+ b.nick_name
+ FROM
+ shop_salesman_apply a
+ LEFT JOIN biz_user b ON a.user_id = b.user_id
+ LEFT JOIN shop_salesman_grade g ON b.salesman_grade = g.id
+ <where>
+ and a.company_id=#{record.companyId}
+ <if test="record.shenheState != null and record.shenheState != ''">
+ and a.apply_status=#{shenheState}
+ </if>
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ <if test="record.offset >=0 and record.limit >0">
+ limit
+ #{record.offset},#{record.limit}
+ </if>
+ </select>
+
+ <select id="findShopSalesmanApplyListTotal" resultType="java.lang.Integer">
+ SELECT count(*)
+ FROM
+ shop_salesman_apply a
+ LEFT JOIN biz_user b ON a.user_id = b.user_id
+ LEFT JOIN shop_salesman_grade g ON b.salesman_grade = g.id
+ <where>
+ and a.company_id=#{record.companyId}
+ <if test="record.shenheState != null and record.shenheState != ''">
+ and a.apply_status=#{shenheState}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.1