From 6c7ead2d04d9a329069c99d45d3b52d216636caf Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 17 Jan 2025 17:56:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/finpayment/FinPaymentDto.java | 12 +- .../FinPaymentapplyDetailsBelowEve.java | 4 + .../FinPaymentapplyDetailsBelowEveDto.java | 24 ++- .../FinPaymentapplyDetailsBelowEveQuery.java | 44 +++-- .../FinPaymentapplyDetailsBelowEveVo.java | 38 ++--- .../fin/biz/finpayment/FinPaymentService.java | 6 +- .../FinPaymentapplyDetailsBelowEveMapper.java | 8 - .../FinPaymentapplyDetailsBelowEveMapper.xml | 9 +- ...FinPaymentapplyDetailsBelowEveService.java | 159 +++++++++++++----- 9 files changed, 181 insertions(+), 123 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java index ab662e939a..0d7ffe37d2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java @@ -52,17 +52,17 @@ public class FinPaymentDto implements Dto { private String sid; // sid private String remarks; - @ApiModelProperty("单位编码") + @ApiModelProperty("单位编码") private String companyCode; // 单位编码 - @ApiModelProperty("单位名称") + @ApiModelProperty("单位名称") private String companyName; // 单位名称 - @ApiModelProperty("开户行") + @ApiModelProperty("开户行") private String bank; // 开户行 - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号") private String receivingAccount; // 收款银行账号 - @ApiModelProperty("业务类型key") + @ApiModelProperty("业务类型key") private String businessTypeKey; // 业务类型key - @ApiModelProperty("业务类型value") + @ApiModelProperty("业务类型value") private String businessTypeValue; // 业务类型value @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java index 855d01b078..7260c3bed9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java @@ -67,4 +67,8 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity { private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java index bd675b3710..69887ce0de 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java @@ -55,32 +55,38 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("平仓款名称") private String costTitleValue; @ApiModelProperty("款项类别，数据字典") private String costTypeKey; @ApiModelProperty("款项类别") private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") + @ApiModelProperty("付款申请明细的明细sid") private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") + @ApiModelProperty("融资付款开通日期") private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") + @ApiModelProperty("期数") private String period; // 期数 - @ApiModelProperty("付款单位sid") + @ApiModelProperty("付款单位sid") private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") + @ApiModelProperty("付款单位名称") private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") + @ApiModelProperty("收款单位名称") private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") + @ApiModelProperty("收款单位sid") private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号") private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") + @ApiModelProperty("开户行") private String bank; // 开户行 @ApiModelProperty("平仓付款日期") private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java index 1b5660696d..680e4af7ef 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java @@ -51,32 +51,26 @@ import java.math.BigDecimal; @ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件") public class FinPaymentapplyDetailsBelowEveQuery implements Query { + @ApiModelProperty("付款单位名称") + private String payCompany; + @ApiModelProperty("融资付款开通日期") + private String openStartDate; + private String openEndDate; @ApiModelProperty("平仓款名称") private String costTitleValue; - @ApiModelProperty("款项类别，数据字典") - private String costTypeKey; - @ApiModelProperty("款项类别") - private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") - private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") - private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") - private String period; // 期数 - @ApiModelProperty("付款单位sid") - private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") - private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") - private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") - private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") - private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") - private String bank; // 开户行 + @ApiModelProperty("收款单位名称") + private String receiveCompany; @ApiModelProperty("平仓付款日期") - private String exePayDate; - @ApiModelProperty("平仓付款金额") - private BigDecimal exePayPrice; + private String exePayStartDate; + private String exePayEndDate; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("支付状态") + private String state; + + private String orgPath; + private String userSid; + private String menuUrl; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java index 6cf26f5096..285e10c27f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java @@ -53,32 +53,26 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo { private String sid; // sid + @ApiModelProperty("支付状态") + private String state; @ApiModelProperty("平仓款名称") private String costTitleValue; - @ApiModelProperty("款项类别，数据字典") - private String costTypeKey; - @ApiModelProperty("款项类别") - private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") - private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") - private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") - private String period; // 期数 - @ApiModelProperty("付款单位sid") - private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") - private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") - private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") - private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") - private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") - private String bank; // 开户行 + @ApiModelProperty("融资付款开通日期") + private String openDate; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("付款单位名称") + private String payCompany; + @ApiModelProperty("收款单位名称") + private String receiveCompany; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("收款银行账号") + private String receivingAccount; @ApiModelProperty("平仓付款日期") private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("备注") + private String remarks; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java index 2329e8c8a6..63332265d5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java @@ -111,13 +111,13 @@ public class FinPaymentService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java index f7459d6fa8..0431564d6c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java @@ -54,16 +54,8 @@ import java.util.List; @Mapper public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper { - //@Update("update fin_paymentapply_details_below_eve set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from fin_paymentapply_details_below_eve") - List selectListVo(); - @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}") List selByMainSid(String mainSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml index 44d997bd1c..b3faad32a4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml @@ -4,10 +4,9 @@ - - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index 1557e3618b..f8c2dbcec6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -60,55 +64,120 @@ import java.util.List; */ @Service public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(FinPaymentapplyDetailsBelowEveQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto){ + + @Autowired + private SysUserFeign sysUserFeign; + + public PagerVo listPageVo(PagerQuery pq) { + FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + /*if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("fp.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("fp.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + }*/ + if (StringUtils.isNotBlank(query.getPayCompany())) { + qw.like("payCompany", query.getPayCompany()); + } + if (StringUtils.isNotBlank(query.getCostTitleValue())) { + qw.like("costTitleValue", query.getCostTitleValue()); + } + if (StringUtils.isNotBlank(query.getReceiveCompany())) { + qw.like("receiveCompany", query.getReceiveCompany()); + } + if (StringUtils.isNotBlank(query.getPeriod())) { + qw.like("period", query.getPeriod()); + } + if (StringUtils.isNotBlank(query.getRemarks())) { + qw.eq("remarks", query.getRemarks()); + } + if (StringUtils.isNotBlank(query.getPayCompany())) { + qw.like("fp.payCompany", query.getPayCompany()); + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("fp.state", query.getState()); + } + //融资付款开通日期 + qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" + ); + //平仓付款日期 + qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto){ - FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto) { + FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid){ - FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid); - FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid) { + FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid); + FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public List selByMainSid(String mainSid) { - return baseMapper.selByMainSid(mainSid); - } + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } } \ No newline at end of file