往来管理头部统计

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

@@ -51,25 +51,7 @@ public class TransactionServiceImpl extends ServiceImpl<TransactionMapper, Trans
 
     @Override
     public Page<TransactionVo> getPage(TransactionSelectDto dto) {
-        IWrapper<Transaction> wrapper = getWrapper();
-        //条件筛选
-        wrapper.eq(Transaction::getIsFlowingWater, dto.getIsFlowingWater());
-        wrapper.eq(Transaction::getDepartmentId, dto.getDepartmentId());
-        wrapper.eq(Transaction::getType, dto.getType());
-        wrapper.eq(Transaction::getCorporationId, dto.getCorporationId());
-        //关键字搜索
-        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
-            List<Long> accountIds = accountManagementService.listObject(AccountManagement::getId,
-                    q -> q.like(AccountManagement::getName, dto.getKeyword()));
-            wrapper.and(q -> q
-                    .like(Transaction::getAmount, dto.getKeyword())
-                    .or().like(Transaction::getRemark, dto.getKeyword())
-                    .or().in(Transaction::getAccountId, accountIds)
-            );
-        }
-        //排序
-        wrapper.orderByDesc("t", Transaction::getId);
-        Page<TransactionVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        Page<TransactionVo> page = this.baseMapper.getPage(dto.getPage(), setWrapper(dto));
         //赋值往来单位名称
         List<TransactionVo> records = page.getRecords();
         transactionDepartmentService.attributeAssign(records, TransactionVo::getDepartmentId, (item, transactionDepartment) -> {
@@ -110,7 +92,32 @@ public class TransactionServiceImpl extends ServiceImpl<TransactionMapper, Trans
         map.put("tranList",traMap);
         return map;
     }
-
+    /**
+     * 赋值插叙参数
+     * @param dto
+     * @return
+     */
+    private IWrapper<Transaction>  setWrapper(TransactionSelectDto dto){
+        IWrapper<Transaction> wrapper = getWrapper();
+        //条件筛选
+        wrapper.eq(Transaction::getIsFlowingWater, dto.getIsFlowingWater());
+        wrapper.eq(Transaction::getDepartmentId, dto.getDepartmentId());
+        wrapper.eq(Transaction::getType, dto.getType());
+        wrapper.eq(Transaction::getCorporationId, dto.getCorporationId());
+        //关键字搜索
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            List<Long> accountIds = accountManagementService.listObject(AccountManagement::getId,
+                    q -> q.like(AccountManagement::getName, dto.getKeyword()));
+            wrapper.and(q -> q
+                    .like(Transaction::getAmount, dto.getKeyword())
+                    .or().like(Transaction::getRemark, dto.getKeyword())
+                    .or().in(Transaction::getAccountId, accountIds)
+            );
+        }
+        //排序
+        wrapper.orderByDesc("t", Transaction::getId);
+        return wrapper;
+    }
 
     @Override
     @DSTransactional