modify

Helius

2021-01-16 83e572c8b78790f8988a2fd72902912ffbbaa166

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

@@ -30,6 +30,7 @@

        <!-- 扩展字段 -->
        <result property="shopName" column="SHOP_NAME"/>
        <result property="shopShortName" column="SHOP_SHORT_NAME"/>
        <result property="vipPhone" column="PHONE"/>


@@ -321,6 +322,7 @@
            a.*,
            c.su_name as STAFF_NAME,
            d.SHOP_NAME,
            d.shop_short_name,
            b.PHONE,
               b.VIP_NAME
        from sys_order a
@@ -502,6 +504,9 @@
            <if test="record.shopId != null">
                and a.shop_id=#{record.shopId}
            </if>
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}
            </if>
        </where>
        <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
            order by a.order_time desc
@@ -527,6 +532,9 @@
            </if>
            <if test="record.shopId != null">
                and a.shop_id=#{record.shopId}
            </if>
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}
            </if>
        </where>
    </select>
@@ -578,35 +586,4 @@
        order by amount desc, a.shop_id
    </select>

    <select id="selectStaffSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
        select
               b.su_name name,
               b.su_id id,
               b.su_photo photo,
               sum(ZK_TOTAL) amount,
               c.shop_short_name shopName
        from sys_order a
        left join sys_users b on a.STAFF_ID=b.su_id
        left join sys_shop_info c on a.SHOP_ID=c.ID
        <where>
            a.statu in ('已付款', '欠款') and b.su_id is not null
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}
            </if>
            <if test="record.shopId != null">
                and a.shop_id=#{record.shopId}
            </if>
            <if test='record.type == "1" and record.orderTime != null'>
                and date_format(order_time, '%Y-%m-%d') = date_format(#{record.orderTime}, '%Y-%m-%d')
            </if>
            <if test='record.type == "2" and record.orderTime != null'>
                and date_format(order_time, '%Y-%m') = date_format(#{record.orderTime}, '%Y-%m')
            </if>
            <if test='record.type == "3" and record.orderTime != null'>
                and date_format(order_time, '%Y') = date_format(#{record.orderTime}, '%Y')
            </if>
        </where>
        group by b.su_id
        order by amount desc, b.su_id
    </select>
</mapper>