From 3a2f0b97983307d6b0534a49b1275849273b3d66 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 18 Jul 2023 15:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardVehDetailsVo.java | 3 +- .../FinCollectionConfirmationService.java | 1 + .../FinFundsCarriedForwardApplyService.java | 262 ++++++++++++++++-- .../FinFundsCarriedForwardVehMapper.java | 4 + .../FinFundsCarriedForwardVehMapper.xml | 19 ++ .../FinFundsCarriedForwardVehService.java | 8 + .../FinSelectedReceivablesDetailedMapper.java | 2 + .../FinSelectedReceivablesDetailedMapper.xml | 114 +++++--- ...FinSelectedReceivablesDetailedService.java | 10 +- ...ReceivableBillCastToKingDeeBillFields.java | 7 +- .../otherreceivablebill/data_FEntity.json | 10 + .../data_FEntityDetail.json | 31 --- .../otherreceivablebill/data_FEntityPlan.json | 5 - .../otherreceivablebill/data_model.json | 61 +--- .../src/main/resources/application-devv.yml | 8 +- .../src/main/resources/application-devv.yml | 6 +- .../LoanPreloanCreditPeo.java | 2 + .../LoanPreloanCreditPeoDetailsVo.java | 4 + .../LoanPreloanCreditPeoDto.java | 4 + .../LoanPreloanCreditApplyService.java | 1 + .../src/main/resources/application-devv.yml | 6 +- 21 files changed, 401 insertions(+), 167 deletions(-) create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json delete mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityDetail.json delete mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityPlan.json diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java index 7ae1a33141..1048c7b2f0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java @@ -69,5 +69,6 @@ public class FinFundsCarriedForwardVehDetailsVo implements Vo { private String balance; // 剩余金额 @ApiModelProperty("本次使用金额") private String thisUseMoney; // 本次使用金额 - + @ApiModelProperty("联系电话") + private String draweeMobile; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index b4d20aa417..893a3650f4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2789,6 +2789,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName())); } + qw.isNotNull("fcc.busSid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.jyddkydjListPage(page, qw); List records = pagging.getRecords(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index d6a9424922..9dcda1ac6f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -30,10 +30,16 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation; import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*; import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery; @@ -46,10 +52,14 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable; import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; +import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; +import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -60,6 +70,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -67,6 +78,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.ConstantUtils; +import com.yxt.common.base.utils.HanZiConverterPinYin; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; @@ -106,6 +118,12 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService= date_format('" + applyStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.createTime,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" ); - if (StringUtils.isNotBlank(query.getName())){ + if (StringUtils.isNotBlank(query.getName())) { qw.and(wrapper -> wrapper.like("fa.applyDeptName", query.getName()).or().like("fa.createByName", query.getName())); } qw.groupBy("fa.sid"); @@ -397,9 +417,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos(); List yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos(); - if (finFundsCarriedForwardVehDetailsVos.size() > 1 && yxysFinFundsCarriedForwardYXYSKXVos.size() > 1){ + if (finFundsCarriedForwardVehDetailsVos.size() > 1 && yxysFinFundsCarriedForwardYXYSKXVos.size() > 1) { return rb.setMsg("不符合一对多或者多对一的关系，请重新选择"); } BigDecimal jzjehj = new BigDecimal("0"); @@ -533,11 +557,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService finFundsCarriedForwardVehDetailsVos1 = data.getFinFundsCarriedForwardVehDetailsVos(); + List yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos(); String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData(); - baseMapper.updatePathBySid(pdfPath,sid); + baseMapper.updatePathBySid(pdfPath, sid); updateYeBySid(sid); for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); - if (finUncollectedReceivablesDetailed != null){ + if (finUncollectedReceivablesDetailed != null) { BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); } } + List jzCustNos = new ArrayList<>(); + List ysCustNos = new ArrayList<>(); + for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos1) { + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid()); + String custNo = ""; + if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款 + custNo = finSelectedReceivablesDetailed.getContractNo(); + } else {//贷款 + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); + custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); + } + jzCustNos.add(custNo); + } + jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList()); + for (String jzCustNo : jzCustNos) { + OtherReceivable otherReceivable = new OtherReceivable(); + otherReceivable.setCommUnit(jzCustNo); + otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode()); + otherReceivable.setBussDate(DateUtil.formatDate(new Date())); + OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto(); + collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode()); + jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2); + String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid()); + collectionDetailDto.setExTaxMoney(jzMoney); + otherReceivableBillService.otherReceivableBillService(otherReceivable); + } + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos1) { + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid()); + String custNo = ""; + if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款 + custNo = finSelectedReceivablesDetailed.getContractNo(); + } else {//贷款 + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); + custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); + } + ysCustNos.add(custNo); + } + ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList()); + for (String ysCustNo : ysCustNos) { + OtherReceivable otherReceivable = new OtherReceivable(); + otherReceivable.setCommUnit(ysCustNo); + otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode()); + otherReceivable.setBussDate(DateUtil.formatDate(new Date())); + OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto(); + collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode()); + ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2); + String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid()); + collectionDetailDto.setExTaxMoney("-" + jzMoney); + otherReceivableBillService.otherReceivableBillService(otherReceivable); + } return rb.success(); } } @@ -632,11 +711,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxyskxVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) { - finSelectedReceivablesDetailedService.updateAuditStateBySid(1,appFinFundsCarriedForwardYXYSKXVo.getSid()); + finSelectedReceivablesDetailedService.updateAuditStateBySid(1, appFinFundsCarriedForwardYXYSKXVo.getSid()); } for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); - if (finUncollectedReceivablesDetailed != null){ + if (finUncollectedReceivablesDetailed != null) { BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); @@ -788,7 +867,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); - if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); @@ -843,10 +922,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); - if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); - if (finUncollectedReceivablesDetailed != null){ + if (finUncollectedReceivablesDetailed != null) { BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); @@ -885,10 +964,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); - if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); - if (finUncollectedReceivablesDetailed != null){ + if (finUncollectedReceivablesDetailed != null) { BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); @@ -909,10 +988,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); - if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); - if (finUncollectedReceivablesDetailed != null){ + if (finUncollectedReceivablesDetailed != null) { BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); @@ -931,6 +1010,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); @@ -954,10 +1038,111 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService finFundsCarriedForwardVehDetailsVos = finFundsCarriedForwardVehService.fetchByMainSid(businessSid); - for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) { - finSelectedReceivablesDetailedService.updateAuditStateBySid(3,finFundsCarriedForwardVehDetailsVo.getBusSid()); + baseMapper.updatePathBySid(pdfPath, businessSid); + List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid()); + } + List finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos(); + List jzCustNos = new ArrayList<>(); + List ysCustNos = new ArrayList<>(); + if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) { + List finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid()); + for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) { + String customerName = finFundsCarriedForwardVehDetailsVo.getCustomerName(); + String draweeMobile = finFundsCarriedForwardVehDetailsVo.getDraweeMobile(); + String custNo = getPrefix(finFundsCarriedForwardApply.getStaffSid(), customerName, draweeMobile); + jzCustNos.add(custNo); + } + jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList()); + for (String jzCustNo : jzCustNos) { + OtherReceivable otherReceivable = new OtherReceivable(); + otherReceivable.setCommUnit(jzCustNo); + otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode()); + otherReceivable.setBussDate(DateUtil.formatDate(new Date())); + OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto(); + collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode()); + jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2); + String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid()); + collectionDetailDto.setExTaxMoney(jzMoney); + otherReceivableBillService.otherReceivableBillService(otherReceivable); + } + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid()); + String custNo = ""; + if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款 + custNo = finSelectedReceivablesDetailed.getContractNo(); + } else {//贷款 + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); + custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); + } + ysCustNos.add(custNo); + } + ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList()); + for (String ysCustNo : ysCustNos) { + OtherReceivable otherReceivable = new OtherReceivable(); + otherReceivable.setCommUnit(ysCustNo); + otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode()); + otherReceivable.setBussDate(DateUtil.formatDate(new Date())); + OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto(); + collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode()); + ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2); + String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid()); + collectionDetailDto.setExTaxMoney("-" + jzMoney); + otherReceivableBillService.otherReceivableBillService(otherReceivable); + } + } else if ("已认款".equals(finFundsCarriedForwardApply.getSource())) { + for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) { + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid()); + String custNo = ""; + if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款 + custNo = finSelectedReceivablesDetailed.getContractNo(); + } else {//贷款 + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); + custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); + } + jzCustNos.add(custNo); + } + jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList()); + for (String jzCustNo : jzCustNos) { + OtherReceivable otherReceivable = new OtherReceivable(); + otherReceivable.setCommUnit(jzCustNo); + otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode()); + otherReceivable.setBussDate(DateUtil.formatDate(new Date())); + OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto(); + collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode()); + jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2); + String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid()); + collectionDetailDto.setExTaxMoney(jzMoney); + otherReceivableBillService.otherReceivableBillService(otherReceivable); + } + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid()); + String custNo = ""; + if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款 + custNo = finSelectedReceivablesDetailed.getContractNo(); + } else {//贷款 + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); + custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); + } + ysCustNos.add(custNo); + } + ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList()); + for (String ysCustNo : ysCustNos) { + OtherReceivable otherReceivable = new OtherReceivable(); + otherReceivable.setCommUnit(ysCustNo); + otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode()); + otherReceivable.setBussDate(DateUtil.formatDate(new Date())); + OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto(); + collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode()); + ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2); + String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid()); + collectionDetailDto.setExTaxMoney("-" + jzMoney); + otherReceivableBillService.otherReceivableBillService(otherReceivable); + } } } else { //极光推送 @@ -1096,7 +1281,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos(); List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); Map dataMap = new HashMap(); - if (StringUtils.isNotBlank(data.getProcInsId())){ + if (StringUtils.isNotBlank(data.getProcInsId())) { List flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInsId(), "1").getData(); if (flowRecordVo != null) { for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { @@ -1157,4 +1342,35 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(staffSid); + if (staffOrgResultBean.getSuccess()) { + SysStaffOrg sysStaffOrg = staffOrgResultBean.getData(); + if (sysStaffOrg != null) { + ResultBean resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath()); + if (resultBean1.getSuccess()) { + String osid = resultBean1.getData(); + if (StringUtils.isNotBlank(osid)) { + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre(); + } + } + } + String orgSid1 = sysStaffOrg.getOrgSid(); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode(); + } + } + } + customerNoPrefix = customerNoPrefix + mobile + HanZiConverterPinYin.getPinYinFirst(name); + System.out.println(customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix); + return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java index b4d160c8e0..ab7f1ebd80 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java @@ -76,4 +76,8 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper sidsList); + + List fetchByMainSidAndGroupCustPhone(String sid); + + String fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml index c82952c058..08186c6e69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml @@ -44,4 +44,23 @@ #{item} + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java index 960d112bba..d3c5bec371 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java @@ -161,4 +161,12 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService sidsList) { return baseMapper.selectByBusSid(sidsList); } + + public List fetchByMainSidAndGroupCustPhone(String sid) { + return baseMapper.fetchByMainSidAndGroupCustPhone(sid); + } + + public String fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) { + return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid); + } } \ No newline at end of file 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 ab4da82130..96828c9775 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 @@ -156,6 +156,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectListByReceivableSid(String receivablesSid); 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 e9c89a42bb..fcfca40016 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 @@ -24,25 +24,18 @@ @@ -217,6 +211,7 @@ and auditState = #{state} and receivablesName = #{type} and payTypeKey = #{payTypeKey} + and subscribedOf = 0 @@ -234,6 +230,7 @@ from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{state} + and subscribedOf = 0 and receivablesName = #{type} @@ -246,6 +243,7 @@ and receivablesName = #{type} and customerName = #{customerName} and customerPhone = #{customerPhone} + and subscribedOf = 0 and length(VIN) > 0 @@ -257,6 +255,7 @@ and auditState = #{state} and receivablesName = #{type} and contractNo = #{contractNo} + and subscribedOf = 0 and length(VIN) > 0 @@ -268,6 +267,7 @@ and auditState = #{state} and receivablesName = #{type} and contractNo = #{contractNo} + and subscribedOf = 0 and length(VIN) = 0 @@ -280,6 +280,7 @@ and receivablesName = #{type} and customerName = #{customerName} and customerPhone = #{customerPhone} + and subscribedOf = 0 and length(VIN) = 0 @@ -290,6 +291,7 @@ LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid` where ff.busVinSid = #{busVinSid} and fd.auditState = 3 + and subscribedOf = 0 @@ -352,31 +354,65 @@ + +