Merge branch 'dev-20241205' into 'master'

add：红旗项目门店月度预值接口

See merge request !69

src/main/java/com/afanticar/afantiopenapi/controller/FawOpenController.java

@@ -92,6 +92,7 @@ public class FawOpenController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "store_code", value = "门店编码", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "expected_month", value = "预值月份", paramType = "path", dataType = "Integer"),
+            @ApiImplicitParam(name = "upload_month", value = "上传月份", paramType = "path", dataType = "Integer"),
             @ApiImplicitParam(name = "current_page", value = "页码", paramType = "path", dataType = "Integer"),
             @ApiImplicitParam(name = "page_size", value = "页数", paramType = "path", dataType = "Integer"),
     })
@@ -99,8 +100,9 @@ public class FawOpenController extends BaseController {
     public BaseResponse<BasePageVO<HongqiProjectStoreExpectedValueInfo>> getStatisticsInfo(@Max(value = 500, message = "单页数据page_size过大") @RequestParam(name = "page_size", defaultValue = "100", required = false) Integer pageSize,
                                                                                            @RequestParam(name = "current_page", defaultValue = "1", required = false) Integer pageNum,
                                                                                            @RequestParam(name = "store_code", required = false) String storeCode,
-                                                                                           @RequestParam(name = "expected_month", required = false) Integer expectedMonth) {
-        return success(fawOpenService.getStatisticsInfo(storeCode, expectedMonth, pageNum, pageSize));
+                                                                                           @RequestParam(name = "expected_month", required = false) Integer expectedMonth,
+                                                                                           @RequestParam(name = "upload_month", required = false) Integer uploadMonth) {
+        return success(fawOpenService.getStatisticsInfo(storeCode, expectedMonth, uploadMonth, pageNum, pageSize));
     }
 
     @ApiOperation(value = "视频数据信息", notes = "视频数据", produces = "application/json")

src/main/java/com/afanticar/afantiopenapi/service/FawOpenService.java

@@ -50,7 +50,7 @@ public class FawOpenService {
 
     static String quarter = "quarter";
 
-    public BasePageVO<HongqiProjectStoreExpectedValueInfo> getStatisticsInfo(String storeCode, Integer expectedMonth, Integer pageNum, Integer pageSize) {
+    public BasePageVO<HongqiProjectStoreExpectedValueInfo> getStatisticsInfo(String storeCode, Integer expectedMonth, Integer uploadMonth, Integer pageNum, Integer pageSize) {
         PageHelper.orderBy(" expected_month desc ");
         IPage<HongqiProjectStoreExpectedValueInfo> page = new Page<>(pageNum, pageSize);
         QueryWrapper<HongqiProjectStoreExpectedValueInfo> queryWrapper = new QueryWrapper<>();
@@ -60,6 +60,9 @@ public class FawOpenService {
         if (expectedMonth != null) {
             queryWrapper.eq("expected_month", expectedMonth);
         }
+        if (uploadMonth != null) {
+            queryWrapper.eq("upload_month", uploadMonth);
+        }
         IPage<HongqiProjectStoreExpectedValueInfo> awemePage = hongqiProjectStoreExpectedValueInfoMapper.selectPage(page, queryWrapper);
         return BasePageVO.restPage(pageNum, (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
     }