From 6c4f9d585fa777b188e74861e275f9605b4a442b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 08:48:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedMapper.xml | 3 +-- ...FinSelectedReceivablesDetailedService.java | 20 +++++++++++++++---- .../CollectedReceivablesDetailedVo.java | 1 - .../AppFinCollectionConfirmationService.java | 7 +++++-- 4 files changed, 22 insertions(+), 9 deletions(-) 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 ab5569fd64..75cb51a568 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 @@ -303,9 +303,8 @@ fd.useOrgSid from fin_selected_receivables_detailed fd left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid - where fd.receivablesName != '订金' and fd.auditState = 3 - ${ew.sqlSegment} + ${ew.sqlSegment} and fd.receivablesName != '订金' and fd.auditState = 3 and concat(IFNULL(fd.customerName , '') 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 8155f9087b..30fb8057ef 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 @@ -332,9 +332,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) { - qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid()); + qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid()); } else { - qw.eq("purchaseSystemSid", "0"); + qw.eq("furd.purchaseSystemSid", "0"); } String useOrgSid = ""; String orgPath = pagerQuery.getParams().getOrgPath(); @@ -345,10 +345,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid); @@ -396,6 +396,18 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService resultBean = busSalesOrderVehicleFeign.details(busVinSid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java index e4d28ca5c9..059d3d74eb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java @@ -41,7 +41,6 @@ public class CollectedReceivablesDetailedVo implements Vo { @ApiModelProperty("剩余金额") - @JsonProperty("receivable") private String reveivableMoney; @ApiModelProperty("业务车辆sid") private String busVinSid; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java index 5f98afaa9b..6cd1a9854c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java @@ -233,7 +233,10 @@ public class AppFinCollectionConfirmationService { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); ResultBean> paymentDetailsList = finSelectedReceivablesDetailedFeign.selectPageList(pq); - PagerVo vo = CoverUtils.selectPagerVo(paymentDetailsList.getData()); - return rb.success().setData(vo); + List voList = Optional.ofNullable(paymentDetailsList.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CollectedReceivablesDetailedVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(paymentDetailsList.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } } \ No newline at end of file From 7573775f53a30aac14a891870380288c8f6f1cc5 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 3 Jul 2023 09:04:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue index 6776536132..2cf9c8c5ec 100644 --- a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue +++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue @@ -181,7 +181,7 @@ export default { this.centerDialogVisible = true var params = { deployId: row.procDefId, - procInsId: row.procInstId, + procInsId: row.procInstSid, token: getStorage() } this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) From 313f63bec5eb2c60cec0e6e74dbcfd66de31f166 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 09:10:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/api/bussalesorder/SolutionsDetailsssVo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index 805fa62282..b59cc1dd92 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -158,4 +158,7 @@ public class SolutionsDetailsssVo { @ApiModelProperty("上装成交价") private String szPrice; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + } From a7a8643ecb493a3b9993ed0efcc12816efc37cc3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 09:23:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=98=E6=94=BE?= =?UTF-8?q?=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/biz/scmvehiclegression/ScmVehicleGressionService.java | 4 ++++ .../scmvehiclegressionveh/ScmVehicleGressionVehMapper.java | 2 ++ .../biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml | 4 ++++ .../scmvehiclegressionveh/ScmVehicleGressionVehService.java | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index e4ef3ba5d5..13151e08e0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -299,6 +299,10 @@ public class ScmVehicleGressionService extends MybatisBaseService iPage = baseMapper.selectCarTransferList(page, qw); List records = iPage.getRecords(); for (ScmVehicleGressionPageVo record : records) { + //根据sid查询该申请下的车辆 + List vinList = scmVehicleGressionVehService.selectByMainSid(record.getSid()); + String vin = String.join(",",vinList); + record.setVin(vin); if(query.getUserSid().equals(record.getCreateBySid())){ record.setAllowModify(true); }else{ diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java index f03111cbe3..f9d4396fd3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java @@ -75,4 +75,6 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper fetchVoByVins(@Param("vin") String vin); + + List selectByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml index b24c451ba2..7846687368 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml @@ -12,4 +12,8 @@ SELECT * FROM scm_vehicle_gression_veh ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java index 072bb77240..cd7155f848 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java @@ -126,4 +126,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService selectByMainSid(String sid) { + return baseMapper.selectByMainSid(sid); + } } \ No newline at end of file From 3b259ac156bbc87871b5a658f43b8bc54c0d09cd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 09:39:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E5=94=AE?= =?UTF-8?q?=E4=B9=B0=E6=96=AD=E7=BB=88=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleActualSalesService.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 311f51669d..644bfbb727 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -812,7 +812,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -826,7 +826,24 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map paramMap = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(paramMap); + //更新车辆状态为未买断 + String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode(); + String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks(); + updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue); + return rb.success().setData(resultBean.getData()); + } } + } return rb.setMsg("操作失败!提交的数据不一致!"); }