|
@@ -188,12 +188,14 @@ public class AccountService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public PageResult<TransferVO> transferList(int pageNo, int pageSize, String outBizNo, String status,
|
|
public PageResult<TransferVO> transferList(int pageNo, int pageSize, String outBizNo, String status,
|
|
|
- Long tenantId, String enterpriseId) {
|
|
|
|
|
|
|
+ Long tenantId, String enterpriseId, String startTime, String endTime) {
|
|
|
var w = new LambdaQueryWrapper<TransferEntity>().orderByDesc(TransferEntity::getId);
|
|
var w = new LambdaQueryWrapper<TransferEntity>().orderByDesc(TransferEntity::getId);
|
|
|
if (outBizNo != null && !outBizNo.isBlank()) w.eq(TransferEntity::getOutBizNo, outBizNo);
|
|
if (outBizNo != null && !outBizNo.isBlank()) w.eq(TransferEntity::getOutBizNo, outBizNo);
|
|
|
if (status != null && !status.isBlank()) w.eq(TransferEntity::getStatus, status);
|
|
if (status != null && !status.isBlank()) w.eq(TransferEntity::getStatus, status);
|
|
|
if (tenantId != null) w.eq(TransferEntity::getTenantId, tenantId);
|
|
if (tenantId != null) w.eq(TransferEntity::getTenantId, tenantId);
|
|
|
if (enterpriseId != null && !enterpriseId.isBlank()) w.eq(TransferEntity::getEnterpriseId, enterpriseId);
|
|
if (enterpriseId != null && !enterpriseId.isBlank()) w.eq(TransferEntity::getEnterpriseId, enterpriseId);
|
|
|
|
|
+ if (startTime != null && !startTime.isBlank()) w.ge(TransferEntity::getCreatedTime, parseDateTime(startTime));
|
|
|
|
|
+ if (endTime != null && !endTime.isBlank()) w.le(TransferEntity::getCreatedTime, parseDateTime(endTime));
|
|
|
var p = new Page<TransferEntity>(pageNo, pageSize);
|
|
var p = new Page<TransferEntity>(pageNo, pageSize);
|
|
|
var r = transferMapper.selectPage(p, w);
|
|
var r = transferMapper.selectPage(p, w);
|
|
|
List<TransferVO> items = r.getRecords().stream().map(this::transferVO).toList();
|
|
List<TransferVO> items = r.getRecords().stream().map(this::transferVO).toList();
|