blame | history | patch | commit | commitdiff | ignore whitespace
jyy
2021-01-09 b5857b4fa654ac45f80e6c485a6c3ce12ca3870a 
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml


@@ -987,13 +987,14 @@


   <select id="selectBeauticianConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">


      select


         b.su_name name,


         b.su_id id,


         sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) + IFNULL(a.consume, 0)) amount,


         c.shop_short_name shopName


      from achieve_new a


      inner join sys_users b on a.beault_id=b.su_id


      left join sys_shop_info c on a.shop_id=c.ID


      where a.order_type='服务单'


      <where>


         a.order_type='服务单'


         <if test="record.companyId != null">


            and a.company_id=#{record.companyId}


         </if>