From 2e927bc535c33df9b13a2f636d90dc97be4c31c2 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 21 Nov 2022 14:56:44 +0800 Subject: [PATCH] =?UTF-8?q?PC=E6=AC=BE=E9=A1=B9=E7=94=B3=E8=AF=B7=E5=92=8C?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 5 +- .../BusSalesOrderFeignFallback.java | 5 + .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 21 ++- .../biz/bussalesorder/BusSalesOrderRest.java | 5 + .../bussalesorder/BusSalesOrderService.java | 9 ++ .../FinCollectionConfirmationService.java | 130 +++++++++++++----- .../FinSelectedReceivablesDetailedMapper.java | 4 +- ...FinSelectedReceivablesDetailedService.java | 4 +- ...nUncollectedReceivablesDetailedMapper.java | 1 + ...inUncollectedReceivablesDetailedMapper.xml | 8 ++ ...UncollectedReceivablesDetailedService.java | 4 + 12 files changed, 152 insertions(+), 46 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 16a13946e8..8cedb3b0ed 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -228,5 +228,8 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean> getApprovalContractList(@RequestBody PagerQuery pagerQuery); - + @ApiOperation("查询该合同下的该辆车架号的车辆sid") + @GetMapping("/getVinSidByConSid") + @ResponseBody + ResultBean getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 462e43f3c6..8e28f94215 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -203,4 +203,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean> getApprovalContractList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean getVinSidByConSid(String contractNo, String vinNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 20edc0cca1..61f09deb8d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -181,4 +181,6 @@ public interface BusSalesOrderMapper extends BaseMapper { BusSalesOrderDetailsVo getByContractNo(String contractNo); + + String getVinsidByConSid(@Param("contractNo") String contractNo, @Param("vinNo") String vinNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 5c84cb5e71..9a132dd1ea 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -244,13 +244,14 @@ ${ew.sqlSegment} and concat(IFNULL(bo.contractNo - , '') - , ifnull(bo.customerName - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(bo.customerName + , '')) LIKE concat('%' + , #{name} + , '%') - and length(bo.contractNo) > 1 + and length(bo.contractNo) + > 1 + select linkSid + from bus_sales_order_vehicle bv + left join bus_sales_order bo on bo.sid = bv.salesOrderSid + where bo.contractNo = #{contractNo} + and bv.linkNo = #{vinNo} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index f4b0590c27..e38812954c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -280,4 +280,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); return new ResultBean>().success().setData(pagerVo); } + + @Override + public ResultBean getVinSidByConSid(String contractNo, String vinNo) { + return busSalesOrderService.getVinSidByConSid(contractNo,vinNo); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6de46159c0..a4f7881c9e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2895,4 +2895,13 @@ public class BusSalesOrderService extends MybatisBaseService getVinSidByConSid(String contractNo, String vinNo) { + ResultBean rb = ResultBean.fireFail(); + String vinSid = baseMapper.getVinsidByConSid(contractNo, vinNo); + if (StringUtils.isBlank(vinSid)) { + return rb.setData(""); + } + return rb.success().setData(vinSid); + } } \ 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 4fd47fc55a..052e3018c4 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 @@ -34,13 +34,11 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo; -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.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; @@ -111,15 +109,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); qw.eq("useOrgSid", query.getUseOrgSid()); - if (StringUtils.isNotBlank(query.getCreateBySid())) { - qw.eq("createBySid", query.getCreateBySid()); - } String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). @@ -138,6 +135,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService -1) { s = s.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setLinkSid(sid); commonAppendixDto.setFilePath(s); commonAppendixDto.setCreateBySid(dto.getStaffSid()); commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); @@ -265,23 +265,40 @@ public class FinCollectionConfirmationService extends MybatisBaseService -1) { s = s.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setLinkSid(sid); commonAppendixDto.setFilePath(s); commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); commonAppendixFeign.save(commonAppendixDto); } remFilePath += s + ","; } finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) { + //已选 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed); - finSelectedReceivablesDetailed.setCollSid(sid1); + //主表sid + finSelectedReceivablesDetailed.setCollSid(sid); + //设置审核状态为待审核 finSelectedReceivablesDetailed.setAuditState(1); + finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid); finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); + //添加已选车架号为临时状态 + BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); + baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); + baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks()); + baseVehicleTempstateDto.setTempKey("1"); + baseVehicleTempstateDto.setTempValue("待审核"); + baseVehicleTempstateDto.setBusSid(sid); + //根据合同编号和车架号查询该合同的车辆sid + ResultBean resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailedDto.getContractNo(), finSelectedReceivablesDetailedDto.getVIN()); + if (resultBean.getSuccess()) { + baseVehicleTempstateDto.setVehSid(resultBean.getData()); + } + ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto); //已选应收款项-车架号 - String vin = finSelectedReceivablesDetailed.getVIN(); + /* String vin = finSelectedReceivablesDetailed.getVIN(); //已选应收款项-应收项目名称 String receivablesName = finSelectedReceivablesDetailed.getReceivablesName(); FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); @@ -299,9 +316,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); BigDecimal totalSubscriptionMone = new BigDecimal(0); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); @@ -309,11 +326,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentVoucherAppendixs = new ArrayList<>(); - ArrayList remittanceConfirmationAppendixs = new ArrayList<>(); - String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl(); - String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl(); - String[] split1 = remittanceConfirmationUrl.split(","); + BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); + + List paymentVoucherAppendixs = new ArrayList<>(); + List remittanceConfirmationAppendixs = new ArrayList<>(); + /* String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl(); + String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();*/ + /* String[] split1 = remittanceConfirmationUrl.split(","); String[] split = paymentVoucherUrl.split(","); BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); for (String s : split) { @@ -342,9 +359,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo(); + commonApp.setFilePath(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath()); + BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo); + paymentVoucherAppendixs.add(paymentVoucherAppendixVo); + } } finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs); - for (String s : split1) { + /* for (String s : split1) { ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s); CommonAppendixVo data = commonAppendixVoResultBean.getData(); String filePath = data.getFilePath(); @@ -353,6 +383,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); @@ -795,14 +838,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - String vin = finSelectedReceivablesDetailedVo.getVIN(); + //更新审核时间 + finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2"); + /* String vin = finSelectedReceivablesDetailedVo.getVIN(); String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); String sid1 = finUncollectedReceivablesDetailedVo.getSid(); BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney)); - finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1); + finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);*/ } FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); @@ -810,6 +855,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { String sid1 = finSelectedReceivablesDetailedVo.getSid(); - finSelectedReceivablesDetailedService.cashierConfirm(sid1); - finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1); +// finSelectedReceivablesDetailedService.cashierConfirm(sid1); + //更新审核时间 + finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1, "3"); + //认款金额 BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney); String vin = finSelectedReceivablesDetailedVo.getVIN(); String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); - FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - String sid2 = finUncollectedReceivablesDetailedVo.getSid(); + String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid(); +// FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); + FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecNameOrgSid(vin, receivablesName, useOrgSid); +// String sid2 = finUncollectedReceivablesDetailedVo.getSid(); + //应收未收款项-当前应收金额 BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney()); + //已选应收款项-认款金额 BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); - if (subtract.compareTo(BigDecimal.ZERO) == 0) { + finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); + BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); + finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); + /* if (subtract.compareTo(BigDecimal.ZERO) == 0) { int subscriptionState = 3; finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); } else { int subscriptionState = 2; finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); - } + }*/ } /* FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); @@ -849,6 +907,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService selectDetailedGroupConAndRecAndPay(); - @Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}") - void updateAuditDateBySid(String sid1); + @Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}") + void updateAuditDateBySid(@Param("sid1") String sid1,@Param("auditState") String auditState); List selectByCollSid(@Param("collectionBillSid") String collectionBillSid); 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 51e0cc2915..6cae9a229c 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 @@ -200,8 +200,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByCollSid(String collectionBillSid) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 2256e69f62..07774f130b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -66,6 +66,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectListVo(); FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); + FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(@Param("vin") String vin, @Param("receivablesName") String receivablesName,@Param("useOrgSid")String useOrgSid); @Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}") void updateCurRecMoneyBySid(@Param("curRecMoney") String curRecMoney, @Param("sid") String sid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 931a3d1d8b..cb34551931 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -27,6 +27,14 @@ AND receivablesName = #{receivablesName} + +