From fa3ad3733aaf394c82fa8f39bea3b789c3a7cc37 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 3 Jul 2023 15:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=87=BA=E5=BA=93=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E6=AC=BE=E9=A1=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicleout/BaseVehicleOutDto.java | 6 +- ...FinSelectReceivablesDetailedWCKCLRKVo.java | 44 ++++++++ .../FinSelectedReceivablesDetailedFeign.java | 4 + ...ectedReceivablesDetailedFeignFallback.java | 5 + ...ReceivablesPaymentDetailsWCKCLRKQuery.java | 42 +++++++ .../FinSelectedReceivablesDetailedMapper.java | 7 +- .../FinSelectedReceivablesDetailedMapper.xml | 33 +++++- .../FinSelectedReceivablesDetailedRest.java | 8 ++ ...FinSelectedReceivablesDetailedService.java | 104 ++++++++++++++++-- 9 files changed, 236 insertions(+), 17 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index 3f4708b463..0cfbb30f0c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -75,7 +75,7 @@ public class BaseVehicleOutDto implements Dto { @ApiModelProperty("中介人2编码") private String middleCodeTwo; @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + private String createOrgSid; @ApiModelProperty("上装/挂车物料分组code") private String trailerOrInstallMGroupCode; @@ -95,10 +95,10 @@ public class BaseVehicleOutDto implements Dto { private String totalDealPrice; @ApiModelProperty("单据编号") - private String billNo; // 单据编号 + private String billNo; @ApiModelProperty("是否要修改客户") - private String isUpdateOrInsertCrm; // 是否要修改客户 + private String isUpdateOrInsertCrm; @ApiModelProperty("财务中客户编码") private String cwCustomerNo; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java new file mode 100644 index 0000000000..55e723e4c5 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 已认款项列表 + * @author: dimengzhe + * @date: 2023/6/29 + **/ +@Data +public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo { + + @ApiModelProperty("当前行sid") + private String sid; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("销售专员部门名称") + private String staffDeptName; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("全款贷款") + private String payType; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String customerPhone; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("应收项目名称") + private String receivablesName; + @ApiModelProperty("认款日期") + private String auditDate; + @ApiModelProperty("认款金额") + private String subscriptionMoney; + @ApiModelProperty("剩余金额") + private String reveivableMoney; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java index a7229c6909..528c98fd91 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java @@ -83,4 +83,8 @@ public interface FinSelectedReceivablesDetailedFeign { @ApiOperation("选择已认款项") @PostMapping("/selectPageList") ResultBean> selectPageList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("未出库车辆已认款项列表") + @PostMapping("/noOutVehRecPageList") + ResultBean> noOutVehRecPageList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java index 7805be5827..5c86240fba 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java @@ -83,4 +83,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR return null; } + @Override + public ResultBean> noOutVehRecPageList(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java new file mode 100644 index 0000000000..9f110879a5 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 已认款查询 + * @author: dimengzhe + * @date: 2023/6/29 + **/ +@Data +public class FinSelectedReceivablesPaymentDetailsWCKCLRKQuery implements Query { + + @ApiModelProperty("销售专员部门名称") + private String staffDeptName; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("可用最小金额") + private String balanceSmallMoney; + @ApiModelProperty("可用最大金额") + private String balanceBigMoney; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("机构sid") + private String orgPath; + private String menuUrl; + private String menuSid; + + @ApiModelProperty("移动端查询条件") + private String name; + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 575771da64..61edc6f0ae 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -33,10 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import org.apache.ibatis.annotations.*; @@ -153,4 +150,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectUnSelectList(@Param("purchaseSystemSid") String purchaseSystemSid, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid); List selectPageList(@Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + IPage noOutVehRecPageList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 75cb51a568..951625563f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -282,8 +282,12 @@ + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java index 374b5ef129..cca723042b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -105,4 +106,11 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable return new ResultBean>().success().setData(pagerVo); } + @Override + public ResultBean> noOutVehRecPageList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finSelectedReceivablesDetailedService.noOutVehRecPageList(pagerQuery); + return rb.success().setData(pv); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 30fb8057ef..1d560734a5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -29,14 +29,20 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -71,6 +77,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService listPage(PagerQuery pq) { FinSelectedReceivablesDetailedQuery query = pq.getParams(); @@ -362,13 +372,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService noOutVehRecPageList(PagerQuery pagerQuery) { + FinSelectedReceivablesPaymentDetailsWCKCLRKQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + 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("fcc.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("fcc.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + qw.eq("ferd.auditState", 3); + qw.ne("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode()); + if (StringUtils.isNotBlank(query.getStaffDeptName())){ + qw.like("fcc.staffDeptName",query.getStaffDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())){ + qw.like("fcc.staffName",query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getContractNo())){ + qw.like("ferd.contractNo",query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getCustomerName())){ + qw.like("ferd.customerName",query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getMobile())){ + qw.like("ferd.customerPhone",query.getMobile()); + } + if (StringUtils.isNotBlank(query.getVinNo())){ + qw.like("ferd.VIN",query.getVinNo()); + } + String balanceSmallMoney = query.getBalanceSmallMoney(); + String balanceBigMoney = query.getBalanceBigMoney(); + //TODO 缺少可用余额查询条件 + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.noOutVehRecPageList(page, qw); + for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) { + String useOrgSid = record.getUseOrgSid(); + String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName(); + record.setUseOrgName(useOrgName); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file