流水统计添加 条件过滤

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRunningWaterController.java

@@ -116,9 +116,9 @@ public class AccountRunningWaterController {
     /**
      * 流水统计
      */
-    @GetMapping("/getTotal")
-    public Map<String, List<AccountRunningWaterVo>> internalTransfer() {
-        return accountRunningWaterService.getTotal();
+    @PostMapping("/getTotal")
+    public Map<String, List<AccountRunningWaterVo>> internalTransfer(@RequestBody AccountRunningWaterSelectDto dto) {
+        return accountRunningWaterService.getTotal(dto);
     }
 
 }

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountRunningWaterMapper.java

@@ -44,5 +44,5 @@ public interface AccountRunningWaterMapper extends BaseMapper<AccountRunningWate
     /**
      * 获取统计
      */
-    List<AccountRunningWaterVo> getTotal(@Param("ew") IWrapper<AccountRunningWater> wrapper);
+    List<AccountRunningWaterVo> getTotal(@Param("ew") QueryWrapper<Object> wrapper);
 }

hx-account/src/main/java/com/fjhx/account/service/account/AccountRunningWaterService.java

@@ -77,5 +77,5 @@ public interface AccountRunningWaterService extends BaseService<AccountRunningWa
     /**
      * 流水统计
      */
-    Map<String, List<AccountRunningWaterVo>> getTotal();
+    Map<String, List<AccountRunningWaterVo>> getTotal(AccountRunningWaterSelectDto dto);
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -68,8 +68,11 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     @Autowired
     private TaxRefundDetailsService taxRefundDetailsService;
 
-    @Override
-    public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
+
+    /**
+     * 分页条件抽取
+     */
+    private QueryWrapper<Object> getPageWrapper(AccountRunningWaterSelectDto dto){
         QueryWrapper<Object> wrapper = Wrappers.query();
         // 资金账户
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()), "arw.account_management_id", dto.getAccountManagementId());
@@ -107,7 +110,11 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         else {
             wrapper.orderByDesc("arw.transaction_time", "arw.id");
         }
-
+        return wrapper;
+    }
+    @Override
+    public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
+        QueryWrapper<Object> wrapper = getPageWrapper(dto);
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AccountRunningWaterVo> records = page.getRecords();
         //赋值归属公司名称
@@ -477,15 +484,16 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     }
 
     @Override
-    public Map<String, List<AccountRunningWaterVo>> getTotal() {
+    public Map<String, List<AccountRunningWaterVo>> getTotal(AccountRunningWaterSelectDto dto) {
+        QueryWrapper<Object> wrapper = getPageWrapper(dto);
+        wrapper.groupBy("arw.currency");
+        wrapper.groupBy("arw.`status`");
+
         Map<String, List<AccountRunningWaterVo>> map = new HashMap<>();
         map.put("income", new ArrayList<>());
         map.put("expenditure", new ArrayList<>());
 
-        List<AccountRunningWaterVo> totalList = baseMapper.getTotal(IWrapper.<AccountRunningWater>getWrapper()
-                .groupBy("arw.currency")
-                .groupBy("arw.`status`")
-        );
+        List<AccountRunningWaterVo> totalList = baseMapper.getTotal(wrapper);
         if (ObjectUtil.isEmpty(totalList)) {
             return map;
         }