接口修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/ActivityController.java

@@ -64,6 +64,16 @@ public class ActivityController extends BaseController {
         return activityVoTableDataInfo;
     }
 
+    /**
+     * 查询活动信息列表
+     */
+    @ApiOperation("查询活动信息列表")
+    @GetMapping("/list")
+    public R<List<ActivityVo>> list(@Validated(QueryGroup.class) ActivityBo bo) {
+        return R.ok(iActivityService.queryList(bo));
+    }
+
+
     /**
      * 获取活动信息详细信息
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/AnalysisController.java

@@ -10,9 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -47,8 +45,8 @@ public class AnalysisController extends BaseController {
      */
     @ApiOperation("门店活跃度排行")
     @SaCheckPermission("clock:analysis:rank")
-    @GetMapping("/shopActivityRank")
-    public R<List<ShopActivityRankVo>> shopActivityRank(AnalysisQueryBo bo) {
+    @PostMapping("/shopActivityRank")
+    public R<List<ShopActivityRankVo>> shopActivityRank(@RequestBody AnalysisQueryBo bo) {
         return R.ok(iClockRecordService.queryShopActivityRank(bo));
     }
 
@@ -57,8 +55,8 @@ public class AnalysisController extends BaseController {
      */
     @ApiOperation("参与人数与销量趋势")
     @SaCheckPermission("clock:analysis:trend")
-    @GetMapping("/trend")
-    public R<List<TrendVo>> trend(AnalysisQueryBo bo) {
+    @PostMapping("/trend")
+    public R<List<TrendVo>> trend(@RequestBody AnalysisQueryBo bo) {
         return R.ok(iClockRecordService.queryTrend(bo));
     }
 
@@ -67,8 +65,8 @@ public class AnalysisController extends BaseController {
      */
     @ApiOperation("月度参与人数与销量对比")
     @SaCheckPermission("clock:analysis:monthly")
-    @GetMapping("/monthlyComparison")
-    public R<List<MonthlyComparisonVo>> monthlyComparison(AnalysisQueryBo bo) {
+    @PostMapping("/monthlyComparison")
+    public R<List<MonthlyComparisonVo>> monthlyComparison(@RequestBody AnalysisQueryBo bo) {
         return R.ok(iClockRecordService.queryMonthlyComparison(bo));
     }
 

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

@@ -73,17 +73,17 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
     /**
      * 查询门店活跃度排行
      */
-    List<ShopActivityRankVo> queryShopActivityRank(@Param("bo") AnalysisQueryBo bo);
+    List<ShopActivityRankVo> queryShopActivityRank(AnalysisQueryBo bo);
 
     /**
      * 查询参与人数与销量趋势
      */
-    List<TrendVo> queryTrend(@Param("bo") AnalysisQueryBo bo);
+    List<TrendVo> queryTrend(AnalysisQueryBo bo);
 
     /**
      * 查询月度参与人数与销量对比
      */
-    List<MonthlyComparisonVo> queryMonthlyComparison(@Param("bo") AnalysisQueryBo bo);
+    List<MonthlyComparisonVo> queryMonthlyComparison(AnalysisQueryBo bo);
 
     /**
      * 查询门店销量排行榜 TOP 6

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

@@ -301,8 +301,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_employee e ON r.employee_id = e.employee_id
         LEFT JOIN tb_shop s ON e.shop_id = s.shop_id
         WHERE r.status = 0
-        <if test="bo.activityId != null">
-            AND r.activity_id = #{bo.activityId}
+        <if test="activityId != null">
+            AND r.activity_id = #{activityId}
         </if>
         GROUP BY s.shop_id, s.shop_name
         ORDER BY clockCount DESC
@@ -319,8 +319,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         WHERE r.status = 0
           AND r.clock_date >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
-        <if test="bo.activityId != null">
-            AND r.activity_id = #{bo.activityId}
+        <if test="activityId != null">
+            AND r.activity_id = #{activityId}
         </if>
         GROUP BY DATE(r.clock_date)
         ORDER BY DATE(r.clock_date)
@@ -336,8 +336,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         WHERE r.status = 0
           AND r.clock_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
-        <if test="bo.activityId != null">
-            AND r.activity_id = #{bo.activityId}
+        <if test="activityId != null">
+            AND r.activity_id = #{activityId}
         </if>
         GROUP BY DATE_FORMAT(r.clock_date, '%Y-%m')
         ORDER BY DATE_FORMAT(r.clock_date, '%Y-%m')