From 05fcfa75d9bcd29f44c5a28d1a665a496347dce1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 13 Aug 2021 14:43:16 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
index 9cf76e9..3b3a30a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
@@ -13,7 +13,7 @@
 			<result property="name" column="name" />
 			<result property="sealesCommission" column="seales_commission" />
 			<result property="invitationCommission" column="invitation_commission" />
-			<result property="condition" column="condition" />
+			<result property="gradeCondition" column="grade_condition" />
 			<result property="isDefault" column="is_default" />
 			<result property="companyId" column="company_id" />
 	</resultMap>
@@ -29,9 +29,40 @@
 			<result property="name" column="name" />
 			<result property="sealesCommission" column="seales_commission" />
 			<result property="invitationCommission" column="invitation_commission" />
-			<result property="condition" column="condition" />
+			<result property="gradeCondition" column="grade_condition" />
 			<result property="isDefault" column="is_default" />
 			<result property="companyId" column="company_id" />
 	</resultMap>
 
+
+	<select id="getShopSalesmanGradeVo" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanGradeVo">
+		SELECT
+		a.id,
+		a.name
+		FROM
+		shop_salesman_grade a
+		where
+		a.company_id = #{companyId}
+	</select>
+
+	<select id="findFyfaManageList" resultType="com.matrix.system.fenxiao.vo.FyfaManageVo">
+		SELECT
+			a.id id,
+			a.name name,
+			a.self_commission selfCommission,
+			a.seales_commission sealesCommission,
+			a.invitation_commission invitationCommission,
+			a.grade_condition gradeCondition,
+			a.is_default isDefault
+		FROM
+		shop_salesman_grade a
+		<where>
+			a.company_id = #{record.companyId}
+		</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