pengcheng 1 mese fa
parent
commit
404b253795

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/api/controller/clock/ApiClockRecordController.java

@@ -89,7 +89,7 @@ public class ApiClockRecordController extends AbstractApiController {
      */
     @ApiOperation("查询活动销量打卡排行")
     @PostMapping("/saleRankList")
-    public R<List<SaleStatisticRecordVo>> saleRankList(@Validated(QueryGroup.class) SaleStatisticBo bo) {
+    public R<List<SaleStatisticRecordVo>> saleRankList(@Validated(QueryGroup.class) @RequestBody SaleStatisticBo bo) {
         return R.ok(iClockRecordService.querySaleStatisticRecordList(bo));
     }
 
@@ -99,7 +99,7 @@ public class ApiClockRecordController extends AbstractApiController {
      */
     @ApiOperation("查询活动销量打卡排行")
     @PostMapping("/mySaleRank")
-    public R<MySaleStatisticRecordVo> mySaleRank(@Validated(QueryGroup.class) SaleStatisticBo bo) {
+    public R<MySaleStatisticRecordVo> mySaleRank(@Validated(QueryGroup.class) @RequestBody SaleStatisticBo bo) {
         Employee loginUser = getLoginUser();
         if(ObjectUtil.isNull(loginUser)){
             return R.ok(new MySaleStatisticRecordVo());
@@ -114,7 +114,7 @@ public class ApiClockRecordController extends AbstractApiController {
      */
     @ApiOperation("查询我的活动打卡统计")
     @PostMapping("/myActivityStatistic")
-    public R<MyActivityStatisticVo> myActivityStatistic(@Validated(QueryGroup.class) SaleStatisticBo bo) {
+    public R<MyActivityStatisticVo> myActivityStatistic(@Validated(QueryGroup.class) @RequestBody SaleStatisticBo bo) {
         Employee loginUser = getLoginUser();
         if(ObjectUtil.isNull(loginUser)){
             return R.ok(new MyActivityStatisticVo());

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

@@ -27,7 +27,7 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
 
     MySaleStatisticRecordVo mySaleRank(@Param("bo") SaleStatisticBo saleStatisticBo);
 
-    MyActivityStatisticVo myActivityStatistic(@Param("bo") SaleStatisticBo saleStatisticBo);
+    MyActivityStatisticVo myActivityStatistic(SaleStatisticBo saleStatisticBo);
 
     /**
      * 分页查询活动打卡记录列表

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

@@ -145,9 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM
                     tb_clock_record
                 WHERE
-                    employee_id = #{bo.employeeId}
+                    employee_id =#{employeeId}
                   AND status = 0
-                  AND activity_id = #{bo.activityId}
+                  AND activity_id =#{activityId}
             ) as clockCount,
                (
                 SELECT
@@ -156,9 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     tb_clock_record r
                 LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
                 WHERE
-                    r.employee_id = #{bo.employeeId}
+                    r.employee_id =#{employeeId}
                   AND r.status = 0
-                  AND r.activity_id = #{bo.activityId}
+                  AND r.activity_id =#{activityId}
             ) AS saleCount
     </select>
 
@@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT COUNT(*) FROM tb_shop WHERE del_flag = '0') AS shopCount,
             (SELECT COUNT(*) FROM tb_agent WHERE del_flag = '0') AS agentCount,
             (SELECT COUNT(*) FROM tb_clock_record WHERE status = 0) AS clockCount,
-            (SELECT IFNULL(SUM(amount), 0) FROM tb_clock_product_record p 
+            (SELECT IFNULL(SUM(amount), 0) FROM tb_clock_product_record p
              INNER JOIN tb_clock_record r ON p.record_id = r.record_id WHERE r.status = 0) AS productSales
     </select>