接口修改

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -47,8 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="querySaleStatisticRecordList" resultType="com.ruoyi.clock.domain.vo.SaleStatisticRecordVo">
-        SELECT
-            RANK() OVER (ORDER BY IFNULL(SUM(p.amount), 0) DESC, COUNT(DISTINCT r.record_id) DESC) AS `rank`,
+       <!-- SELECT
             r.employee_id AS employeeId,
             e.employee_name AS employeeName,
             a.agent_name AS agentName,
@@ -76,7 +75,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
             r.employee_id
         ORDER BY
-            saleCount DESC
+            saleCount DESC-->
+
+
+        SELECT
+        t.*,
+        (@rank := @rank + 1) AS `rank`
+        FROM (
+        SELECT
+        r.employee_id AS employeeId,
+        e.employee_name AS employeeName,
+        a.agent_name AS agentName,
+        e.avatar AS avatar,
+        s.shop_name AS shopName,
+        IFNULL(SUM(p.amount), 0) AS saleCount
+        FROM
+        tb_clock_record r
+        LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
+        LEFT JOIN tb_activity act ON r.activity_id = act.activity_id
+        LEFT JOIN tb_employee e ON r.employee_id = e.employee_id
+        LEFT JOIN tb_agent a ON e.agent_id = a.agent_id
+        LEFT JOIN tb_shop s ON e.shop_id = s.shop_id
+        WHERE
+        r.status = 0
+        AND act.type = 1
+        <if test="bo.activityId != null">
+            AND r.activity_id = #{bo.activityId}
+        </if>
+        <if test="bo.agentId != null">
+            AND e.agent_id = #{bo.agentId}
+        </if>
+        <if test="bo.shopId != null">
+            AND e.shop_id = #{bo.shopId}
+        </if>
+        GROUP BY
+        r.employee_id, e.employee_name, a.agent_name, e.avatar, s.shop_name
+        ORDER BY
+        saleCount DESC
+        ) t,
+        (SELECT @rank := 0) b
+
     </select>