|
@@ -22,7 +22,6 @@ import com.fjhx.account.service.account.AccountPaymentService;
|
|
import com.fjhx.account.service.account.AccountRemainderService;
|
|
import com.fjhx.account.service.account.AccountRemainderService;
|
|
import com.fjhx.account.service.account.AccountRunningWaterService;
|
|
import com.fjhx.account.service.account.AccountRunningWaterService;
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
-import com.fjhx.common.entity.corporation.po.Corporation;
|
|
|
|
import com.fjhx.common.service.corporation.CorporationService;
|
|
import com.fjhx.common.service.corporation.CorporationService;
|
|
import com.fjhx.file.utils.ObsFileUtil;
|
|
import com.fjhx.file.utils.ObsFileUtil;
|
|
import com.ruoyi.common.core.domain.BasePo;
|
|
import com.ruoyi.common.core.domain.BasePo;
|
|
@@ -68,28 +67,35 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
|
|
public Page<AccountPaymentVo> getPage(AccountRequestFundsSelectDto dto) {
|
|
public Page<AccountPaymentVo> getPage(AccountRequestFundsSelectDto dto) {
|
|
|
|
|
|
QueryWrapper<Object> wrapper = Wrappers.query();
|
|
QueryWrapper<Object> wrapper = Wrappers.query();
|
|
- //付款状态
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()),"ap.status",dto.getPaymentStatus());
|
|
|
|
- wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"ap.payment_remark",dto.getKeyword());
|
|
|
|
- wrapper.orderByDesc("ap.status","ap.payment_time","ap.create_time");
|
|
|
|
- //归属公司
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getCorporationId()),"ap.corporation_id",dto.getCorporationId());
|
|
|
|
- //归属部门
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getDepartmentId()),"ap.corporation_id",dto.getDepartmentId());
|
|
|
|
- //申请人
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getCreateUser()),"ap.create_user",dto.getCreateUser());
|
|
|
|
- //打款类型
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()),"ap.type",dto.getType());
|
|
|
|
- //用款时间
|
|
|
|
- wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()),"ap.payment_time",dto.getBeginTime());
|
|
|
|
- wrapper.le(ObjectUtil.isNotEmpty(dto.getEndTime()),"ap.payment_time",dto.getEndTime());
|
|
|
|
- //币种
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()),"ap.currency",dto.getCurrency());
|
|
|
|
- //交易金额
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getStartAmount()),"ap.amount",dto.getStartAmount());
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getEndAmount()),"ap.amount",dto.getEndAmount());
|
|
|
|
- //款项说明
|
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentRemark()),"ap.payment_remark",dto.getPaymentRemark());
|
|
|
|
|
|
+
|
|
|
|
+ wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "ap.payment_remark", dto.getKeyword());
|
|
|
|
+
|
|
|
|
+ // 归属公司
|
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getCorporationId()), "ap.corporation_id", dto.getCorporationId());
|
|
|
|
+ // 归属部门
|
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getDepartmentId()), "ap.corporation_id", dto.getDepartmentId());
|
|
|
|
+ // 申请人
|
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getCreateUser()), "ap.create_user", dto.getCreateUser());
|
|
|
|
+ // 打款类型
|
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()), "ap.type", dto.getType());
|
|
|
|
+ // 请款时间
|
|
|
|
+ wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginCreateTime()), "ap.create_time", dto.getBeginCreateTime());
|
|
|
|
+ wrapper.le(ObjectUtil.isNotEmpty(dto.getEndCreateTime()), "ap.create_time", dto.getEndCreateTime());
|
|
|
|
+ // 用款时间
|
|
|
|
+ wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "ap.payment_time", dto.getBeginTime());
|
|
|
|
+ wrapper.le(ObjectUtil.isNotEmpty(dto.getEndTime()), "ap.payment_time", dto.getEndTime());
|
|
|
|
+ // 币种
|
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "ap.currency", dto.getCurrency());
|
|
|
|
+ // 交易金额
|
|
|
|
+ wrapper.ge(ObjectUtil.isNotEmpty(dto.getStartAmount()), "ap.amount", dto.getStartAmount());
|
|
|
|
+ wrapper.le(ObjectUtil.isNotEmpty(dto.getEndAmount()), "ap.amount", dto.getEndAmount());
|
|
|
|
+ // 付款状态
|
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()), "ap.status", dto.getPaymentStatus());
|
|
|
|
+ // 款项说明
|
|
|
|
+ wrapper.like(ObjectUtil.isNotEmpty(dto.getPaymentRemark()), "ap.payment_remark", dto.getPaymentRemark());
|
|
|
|
+
|
|
|
|
+ wrapper.orderByDesc("ap.status", "ap.payment_time", "ap.create_time");
|
|
|
|
+
|
|
Page<AccountPaymentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
Page<AccountPaymentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
List<AccountPaymentVo> records = page.getRecords();
|
|
List<AccountPaymentVo> records = page.getRecords();
|
|
if (records.size() == 0) {
|
|
if (records.size() == 0) {
|