修改业绩

935090232@qq.com

2021-03-04 a7f47c8953b2055e7971df01b1aad3b40b128b17

 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml

@@ -28,6 +28,7 @@
      <result property="remark" column="remark" />
      <result property="orderType" column="order_type" />
      <result property="projPercentage" column="proj_percentage" />
      <result property="achieveMoney" column="achieveMoney" />
      <result property="t1" column="t1" />
      <result property="t2" column="t2" />
      <result property="t3" column="t3" />
@@ -76,6 +77,7 @@
      a.consume,
      a.his_consume,
      a.free_consume,
      a.achieveMoney,
      f.su_name meiliao,
      g.su_name guwen,
      a.proj_percentage,
@@ -298,6 +300,7 @@
      <result property="remark" column="remark" />
      <result property="orderType" column="order_type" />
      <result property="projPercentage" column="proj_percentage" />
      <result property="achieveMoney" column="achieveMoney" />
      <result property="t1" column="t1" />
      <result property="t2" column="t2" />
      <result property="t3" column="t3" />
@@ -334,6 +337,7 @@
      remark,
      order_type,
      proj_percentage,
      achieveMoney,
      t1,
      t2,
      t3,
@@ -370,6 +374,7 @@
      #{item.remark},
      #{item.orderType},
      #{item.projPercentage},
      #{item.achieveMoney},
      #{item.t1},
      #{item.t2},
      #{item.t3},
@@ -617,6 +622,9 @@
         <if test="_parameter.containsKey('projPercentage')">
            proj_percentage = #{projPercentage},
         </if>
         <if test="_parameter.containsKey('achieveMoney')">
            achieveMoney = #{achieveMoney},
         </if>
         <if test="_parameter.containsKey('t1')">
            t1 = #{t1},
         </if>
@@ -735,6 +743,9 @@
         </if>
         <if test="record.projPercentage != null ">
            proj_percentage = #{record.projPercentage},
         </if>
         <if test="record.achieveMoney != null ">
            achieveMoney = #{record.achieveMoney},
         </if>
         <if test="record.t1 != null and record.t1 != '' ">
            t1 = #{record.t1},
@@ -941,13 +952,12 @@
      select
         sale_id id,
         sum(case t3 when '现金业绩' then card_cash else 0 end) orderCash,
         sum(case t3 when '划扣业绩' then card_cash else 0 end) cash,
         sum(IFNULL(proj_percentage, 0)) cardUse,
         sum(case t3 when '划扣业绩' then consume else 0 end) cash,
         sum(case order_type when '订单' then proj_percentage else 0 end) cardUse,
         sum(IFNULL(his_consume, 0)) hisConsume,
         sum(IFNULL(free_consume, 0)) freeConsume,
         sum(IFNULL(proj_percentage, 0)) projCommission
         sum(case order_type when '服务单' then proj_percentage else 0 end) projCommission
      from achieve_new a
      left join sys_order b on a.beault_id=b.STAFF_ID and (date_format(b.ORDER_TIME, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(b.ORDER_TIME, '%Y-%m-%d'))
      where a.beault_id=#{userId}
      and (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
   </select>
@@ -965,9 +975,9 @@
      select
         b.shop_short_name name,
         b.SHOP_IMAG photo,
         sum(IFNULL(a.free_consume,0) + IFNULL(a.consume,0) + IFNULL(a.his_consume,0)) amount
         sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume,0)) amount
      from achieve_new a
      left join sys_shop_info b on a.shop_id=b.ID
      left join sys_shop_info b on a.shop_id=b.ID and b.shop_type!=1
      <where>
         <if test="record.companyId != null">
            and a.company_id=#{record.companyId}
@@ -1061,4 +1071,29 @@
      group by b.su_id
      order by amount desc, b.su_id
   </select>

   <select id="selectShopSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
      select
         b.shop_short_name name,
         b.SHOP_IMAG photo,
         sum(IFNULL(a.consume,0) + IFNULL(a.card_cash,0)) amount
      from achieve_new a
      left join sys_shop_info b on a.shop_id=b.ID and shop_type!=1
      <where>
         <if test="record.companyId != null">
            and a.company_id=#{record.companyId}
         </if>
         <if test='record.t1 == "1" and record.datatime != null'>
            and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
         </if>
         <if test='record.t1 == "2" and record.datatime != null'>
            and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
         </if>
         <if test='record.t1 == "3" and record.datatime != null'>
            and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
         </if>
      </where>
      group by a.shop_id
      order by amount desc, a.shop_id
   </select>
</mapper>