接口修改

ruoyi-system/src/main/java/com/ruoyi/clock/mapper/ClockRecordMapper.java

@@ -23,9 +23,9 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
 
     ClockStatisticRecordVo queryClockStatisticRecord(@Param("employeeId") Long employeeId);
 
-    List<SaleStatisticRecordVo> querySaleStatisticRecordList(@Param("bo") SaleStatisticBo saleStatisticBo);
+    List<SaleStatisticRecordVo> querySaleStatisticRecordList(SaleStatisticBo saleStatisticBo);
 
-    MySaleStatisticRecordVo mySaleRank(@Param("bo") SaleStatisticBo saleStatisticBo);
+    MySaleStatisticRecordVo mySaleRank(SaleStatisticBo saleStatisticBo);
 
     MyActivityStatisticVo myActivityStatistic(SaleStatisticBo saleStatisticBo);
 

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

@@ -62,14 +62,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 test="activityId != null">
+            AND r.activity_id = #{activityId}
           </if>
-         <if test="bo.agentId != null">
-              AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{bo.agentId})
+         <if test="agentId != null">
+              AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
           </if>
-        <if test="bo.employeeName != null and bo.employeeName != ''">
-            AND e.employee_name LIKE CONCAT('%', #{bo.employeeName}, '%')
+        <if test="employeeName != null and employeeName != ''">
+            AND e.employee_name LIKE CONCAT('%', #{employeeName}, '%')
         </if>
         GROUP BY
             r.employee_id
@@ -82,18 +82,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             (SELECT COUNT(DISTINCT t.employee_id)
              FROM (
-                      SELECT
-                      r2.employee_id,
-                      IFNULL(SUM(p2.amount), 0) AS total_sale
-                      from tb_clock_record r2
-                      LEFT JOIN tb_activity act2 ON r2.activity_id = act2.activity_id
-                      LEFT JOIN tb_clock_product_record p2 ON r2.record_id = p2.record_id
-                      WHERE r2.status = 0
-                    <if test="bo.activityId != null">
-                        AND  aa2.activity_id = #{bo.activityId}
+                    SELECT
+                    r2.employee_id,
+                    IFNULL(SUM(p2.amount), 0) AS total_sale
+                    from tb_clock_record r2
+                    LEFT JOIN tb_activity act2 ON r2.activity_id = act2.activity_id
+                    LEFT JOIN tb_clock_product_record p2 ON r2.record_id = p2.record_id
+                    WHERE r2.status = 0
+                    <if test="activityId != null">
+                        AND  r2.activity_id = #{activityId}
                     </if>
-                    <if test="bo.agentId != null">
-                        AND r2.activity_id in (select activity_id from tb_activity_agent where agent_id = #{bo.agentId})
+                    <if test="agentId != null">
+                        AND r2.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
                     </if>
                     AND act2.status = 0
                     AND act2.del_flag = '0'
@@ -102,19 +102,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              WHERE t.total_sale > (
                  SELECT IFNULL(SUM(p.amount), 0)
                  FROM tb_clock_record r
-                  LEFT JOIN tb_activity act ON r.activity_id = act.activity_id
-                    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_clock_product_record p ON r.record_id = p.record_id
                  WHERE
-                    <if test="bo.activityId != null">
-                        AND  r.activity_id = #{bo.activityId}
-                    </if>
-                    <if test="bo.agentId != null">
-                        AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{bo.agentId})
-                    </if>
-                    AND r.status = 0
-                    AND r.employee_id = #{bo.employeeId}
-                   AND act.status = 0
-                   AND act.del_flag = '0'
+                 r.status = 0
+                 <if test="activityId != null">
+                    AND r.activity_id = #{activityId}
+                 </if>
+                 <if test="agentId != null">
+                    AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
+                 </if>
+                 AND r.employee_id = #{employeeId}
+                 AND act.status = 0
+                 AND act.del_flag = '0'
                  GROUP BY r.employee_id
              )) + 1 AS `rank`,
             IFNULL(SUM(p.amount), 0) AS saleCount
@@ -123,16 +123,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_activity act ON r.activity_id = act.activity_id
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         WHERE
-             r.status = 0
-            AND r.employee_id = #{bo.employeeId}
-        <if test="bo.activityId != null">
-            AND  r.activity_id = #{bo.activityId}
-        </if>
-        <if test="bo.agentId != null">
-            AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{bo.agentId})
-        </if>
-        AND act.status = 0
-        AND act.del_flag = '0'
+            r.status = 0
+            AND r.employee_id = #{employeeId}
+            <if test="activityId != null">
+                AND  r.activity_id = #{activityId}
+            </if>
+            <if test="agentId != null">
+                AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
+            </if>
+            AND act.status = 0
+            AND act.del_flag = '0'
         GROUP BY
             r.employee_id
     </select>