|
@@ -82,8 +82,11 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
@Autowired
|
|
|
private TransactionDepartmentService transactionDepartmentService;
|
|
|
|
|
|
- @Override
|
|
|
- public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取分页搜索条件
|
|
|
+ */
|
|
|
+ QueryWrapper<Object> getPageWrapper(AccountRunningWaterSelectDto dto) {
|
|
|
QueryWrapper<Object> wrapper = Wrappers.query();
|
|
|
// 资金账户
|
|
|
wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()), "arw.account_management_id", dto.getAccountManagementId());
|
|
@@ -121,6 +124,12 @@ 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();
|
|
@@ -382,36 +391,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
|
|
|
@Override
|
|
|
public void exportExcel(AccountRunningWaterSelectDto dto, HttpServletResponse httpServletResponse) {
|
|
|
- QueryWrapper<Object> wrapper = Wrappers.query();
|
|
|
- //资金账户
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()), "arw.account_management_id", dto.getAccountManagementId());
|
|
|
- //交易类型
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arw.status", dto.getStatus());
|
|
|
- //是否合同到账
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getReceived()), "arw.received", dto.getReceived());
|
|
|
- //币种
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
|
|
|
- //是否认领
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getIsClaim()), "arw.is_claim", dto.getIsClaim());
|
|
|
- //交易开始金额
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "arw.amount", dto.getBeginAmount());
|
|
|
- //交易结束金额
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndAmount()), "arw.amount", dto.getEndAmount());
|
|
|
- //交易开始时间
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arw.create_time", dto.getBeginTime());
|
|
|
- //交易结束金额
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()), "arw.create_time", dto.getEndTime());
|
|
|
- //对方账户名称
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getName()), "arw.name", dto.getName());
|
|
|
- //摘要
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getRemarks()), "arw.name", dto.getRemarks());
|
|
|
- if (StringUtils.isNotEmpty(dto.getKeyword())) {
|
|
|
- wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
|
|
|
- }
|
|
|
- if (ObjectUtil.isNotEmpty(dto.getDataType()) && dto.getDataType() == 1) {//到账认领数据
|
|
|
- wrapper.eq("arw.received", 10);
|
|
|
- wrapper.orderByAsc("arw.is_claim", "arw.create_time");
|
|
|
- }
|
|
|
+ QueryWrapper<Object> wrapper = getPageWrapper(dto);
|
|
|
+
|
|
|
List<AccountRunningWaterVo> records = this.baseMapper.getList(wrapper);
|
|
|
|
|
|
//赋值字典数据
|