From 78cc8a97ce00973197db5b335ad6edd03727161b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 30 Aug 2023 17:07:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=B4=BD=E8=B0=88=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmVehicledemandService.java | 18 +++++ .../loansolutions/LoanSolutionsService.java | 75 ++++++++++--------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index 783dc3cae1..2d2a8c9e23 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -409,6 +409,9 @@ public class CrmVehicledemandService extends MybatisBaseService selectDetails3(String busSid) { ResultBean rb = ResultBean.fireFail(); - SolutionssVo solutionssVo = new SolutionssVo(); + SolutionssVo solutionssVo = null; //根据关联sid查询是否存在金融方案 LoanSolutions loanSolutions = baseMapper.selectByApplySid(busSid); boolean isTrue = false; if (loanSolutions != null) { + solutionssVo = new SolutionssVo(); BeanUtil.copyProperties(loanSolutions, solutionssVo); if (loanSolutions.getTrailerAmount() != null) { solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString()); @@ -2205,37 +2206,8 @@ public class LoanSolutionsService extends MybatisBaseService formList = getFormList(solutionssVo); + solutionssVo.setFinanceForms(formList); + } + solutionssVo.setBusSid(busSid); } - if (isTrue) { - List formList = getFormList(solutionssVo); - solutionssVo.setFinanceForms(formList); - } - solutionssVo.setBusSid(busSid); return rb.success().setData(solutionssVo); } From 97601362f30d53f6ab73247153daf0a613b72b41 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 30 Aug 2023 17:39:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E8=BD=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 3 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../biz/basevehicle/BaseVehicleMapper.java | 2 + .../biz/basevehicle/BaseVehicleMapper.xml | 117 ++++++------ .../base/biz/basevehicle/BaseVehicleRest.java | 5 + .../biz/basevehicle/BaseVehicleService.java | 47 +++-- .../BusDeliveredApplyFeign.java | 10 + .../BusDeliveredApplyFeignFallback.java | 10 + .../BusSalesOrderReturnVeh.java | 31 +-- .../BusSalesOrderReturnVehDetailsVo.java | 31 +-- .../BusSalesOrderReturnVehDto.java | 29 +-- .../BusDeliveredApplyRest.java | 10 + .../BusDeliveredApplyService.java | 44 +++++ .../bussalesorder/BusSalesOrderService.java | 6 +- .../BusSalesOrderReturnVehApplyService.java | 177 ++++++++++++++---- .../BusSalesOrderVehicleMapper.java | 2 + .../BusSalesOrderVehicleMapper.xml | 61 +++--- .../BusSalesOrderVehicleService.java | 4 + .../FinVehicleInvoiceFeign.java | 3 + .../FinVehicleInvoiceFeignFallback.java | 5 + .../FinVehicleInvoiceRest.java | 5 + .../FinVehicleInvoiceService.java | 18 ++ .../AppBusSalesOrderReturnVehDto.java | 27 +-- 23 files changed, 468 insertions(+), 184 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 789fe0ec15..e6a0c58418 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -520,5 +520,8 @@ public interface BaseVehicleFeign { @ResponseBody ResultBean updateLockedState(@RequestParam("vehSid") String vehSid); + @ApiOperation("退车申请后修改状态") + @PostMapping("/updateStateForReturnVeh") + public ResultBean updateStateForReturnVeh(@RequestParam("vehSid") String vehSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index dd143e841a..f586fc34a7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -417,6 +417,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean updateStateForReturnVeh(String vehSid) { + return null; + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid,List list) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 825ed872e8..481c4ea6f4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -501,4 +501,6 @@ public interface BaseVehicleMapper extends BaseMapper { List selByExcel(@Param(Constants.WRAPPER) QueryWrapper qw); IPage vehicleQKKPPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + void updateStateForReturnVeh(String vehSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index ec19096587..9e9adf21d5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -301,7 +301,7 @@ @@ -416,8 +416,8 @@ resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo"> SELECT bv.guidedPrice AS price FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid WHERE bvm.sid = #{modelSid} ORDER BY bv.guidedPrice ASC @@ -425,14 +425,14 @@ @@ -456,8 +456,8 @@ bvm.insideCode, bmc.rearAxleValue FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -542,8 +542,8 @@ bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`department`) as vehModelInfor FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} LIMIT 1 @@ -600,8 +600,8 @@ bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`department`) as vehModelInfor FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1 @@ -727,11 +727,11 @@ (select SUM(cast((cast(bo.platformNo as signed) - IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity from bus_vehicle_order bo - LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid + LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid where bo.useOrgSid = bvc.useOrgSid AND bd.vehicleSid = bvm.sid) AS produceCarNum FROM base_vehicle_model bvm - LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid + LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid WHERE bvc.modelSid = #{modelSid} AND bvc.useOrgSid != #{useOrg} group by bvc.useOrgSid @@ -753,17 +753,17 @@ WHERE bv.modelSid = bvm.sid AND bv.modelConfigSid = bvc.configurationItemsSid AND lockedState = '03') - + + + (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvm.sid AND bvad.configSid = bvc.configurationItemsSid) - ) AS num, + ) AS num, bvm.vehicleTypeCode, bmc.configCode FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -993,8 +993,8 @@ carColor AS color, locationName AS address FROM base_vehicle bv - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid - ${ew.customSqlSegment} + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + ${ew.customSqlSegment} @@ -1214,7 +1214,7 @@ UPDATE - base_vehicle + base_vehicle SET vehicleState = #{vehicleState}, vehicleStateValue = #{vehicleStateValue}, salesDate = #{salesDate}, @@ -1225,7 +1225,7 @@ UPDATE - base_vehicle + base_vehicle SET solidDate = #{solidDate}, settlementStatus = #{settlementStatus}, settlementStatusValue = #{settlementStatusValue} @@ -1350,12 +1350,12 @@ bv.`salesDate`, bv.`solidDate` FROM anrui_scm.`scm_specialrebate_vehs` ssv - LEFT JOIN anrui_base.`base_vehicle` bv - ON ssv.`vehSid` = bv.`sid` - LEFT JOIN base_vehicle_model bvm - ON bv.`modelSid` = bvm.`sid` - AND bv.`createOrgSid` = bvm.`createOrg` - LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` + LEFT JOIN anrui_base.`base_vehicle` bv + ON ssv.`vehSid` = bv.`sid` + LEFT JOIN base_vehicle_model bvm + ON bv.`modelSid` = bvm.`sid` + AND bv.`createOrgSid` = bvm.`createOrg` + LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` WHERE ssv.`specialRebateSid` = #{specialRebateSid} @@ -1576,12 +1576,12 @@ bd.salesPolicy AS label, bdv.guidedQKPrice AS promotionPrice FROM base_vehicle bv - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid - LEFT JOIN base_discountpackage_veh bdv - ON bdv.vehSid = bv.sid - LEFT JOIN base_discountpackage bd - ON bdv.mainSid = bd.sid - ${ew.customSqlSegment} + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + LEFT JOIN base_discountpackage_veh bdv + ON bdv.vehSid = bv.sid + LEFT JOIN base_discountpackage bd + ON bdv.mainSid = bd.sid + ${ew.customSqlSegment} @@ -92,7 +92,7 @@ resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle"> select bv.* from bus_delivered bd - left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid + left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid where bd.contractNo = #{contractNo} and bd.state = 1 and length(bv.linkSid) > 0 @@ -105,8 +105,8 @@ from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = 1)) as bs - left join bus_sales_order_vehicle bv on bs.busSid = bv.sid - left join bus_sales_order bo on bo.sid = bv.salesOrderSid + left join bus_sales_order_vehicle bv on bs.busSid = bv.sid + left join bus_sales_order bo on bo.sid = bv.salesOrderSid where length(bv.linkSid) > 0 and bo.contractNo = #{contractNo} @@ -125,19 +125,19 @@ @@ -218,6 +218,21 @@ + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 6a1d0dbdb8..bab630adf1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -567,4 +567,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectBySalesOrderSid(String saleOrderSid) { return baseMapper.selectBySalesOrderSid(saleOrderSid); } + + public BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid) { + return baseMapper.selectVinNoBySid(sid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index a68ad29b53..9260a4fb64 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -123,5 +123,8 @@ public interface FinVehicleInvoiceFeign { @ResponseBody ResultBean deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); + @ApiOperation("退车时发票作废") + @PostMapping("/updateBillingState") + ResultBean updateBillingState(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index e4826f9168..da34dfe726 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -134,4 +134,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { return null; } + @Override + public ResultBean updateBillingState(String contractNo, String vinSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index 330f32a34e..c39cb6e5dc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -254,4 +254,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { return finVehicleInvoiceService.deliveredFinSelect(contractNo,vinSid); } + @Override + public ResultBean updateBillingState(String contractNo, String vinSid) { + return finVehicleInvoiceService.updateBillingState(contractNo,vinSid); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index e570ec1c9f..49210e2dc9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -647,4 +647,22 @@ public class FinVehicleInvoiceService extends MybatisBaseService Date: Wed, 30 Aug 2023 18:00:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 19 +++++++++++++++++++ ...inUncollectedReceivablesDetailedFeign.java | 4 ++++ ...nUncollectedReceivablesDetailedMapper.java | 2 ++ ...inUncollectedReceivablesDetailedMapper.xml | 6 ++++++ ...FinUncollectedReceivablesDetailedRest.java | 5 +++++ ...UncollectedReceivablesDetailedService.java | 6 ++++++ 6 files changed, 42 insertions(+) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 137d78e32c..ff4ac65589 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -41,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo; @@ -115,6 +116,8 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto)); @@ -1005,6 +1008,14 @@ public class BaseVehicleOutService extends MybatisBaseService selectByBusVinSid(@RequestParam("busVinSid") String busVinSid); } \ No newline at end of file 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 4a1b5611b6..f3bfa36a05 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 @@ -115,4 +115,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper busVinSid, @Param("kxState") String kxState); + + String selectOtherReceivableMoneyByBusVinSid(String busVinSid); } \ No newline at end of file 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 4797c4cc7f..d26a48e8b3 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 @@ -333,4 +333,10 @@ #{item} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 13e595cf46..1820c57524 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -166,6 +166,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece return finUncollectedReceivablesDetailedService.updateKxState(stateQuery); } + @Override + public ResultBean selectByBusVinSid(String busVinSid) { + return finUncollectedReceivablesDetailedService.selectOtherReceivableMoneyByBusVinSid(busVinSid); + } + @Override public ResultBean> selectByContractNo(String contractNo) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 2b6f150e09..f065e6d63c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -993,4 +993,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } return rb.success(); } + + public ResultBean selectOtherReceivableMoneyByBusVinSid(String busVinSid) { + ResultBean rb = ResultBean.fireFail(); + String otherReceivableMoney = baseMapper.selectOtherReceivableMoneyByBusVinSid(busVinSid); + return rb.success().setData(otherReceivableMoney); + } } \ No newline at end of file