From f41340e64ddcb780d2b227f29906baf4503bf59b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 7 Aug 2023 15:39:05 +0800 Subject: [PATCH 1/9] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fedb8efe97..54117cac9a 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 @@ -543,7 +543,7 @@ FROM fin_funds_carried_forward_veh f left JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' + WHERE fa.`nodeState` = '已办结' ) f ON f.`busSid` = d.`sid` WHERE d.auditState = 3 GROUP BY d.`sid`) d From 9eef25c1c15790c6fc9688f6ff354d4c42ba1020 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 8 Aug 2023 08:55:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index 512caa5a93..cfaf69335d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -44,7 +44,7 @@ public interface LoanFinPolicyFeign { ResultBean setRiskState(@RequestBody LoanRiskStateQuery query); @ApiOperation("金融产品政策管理分页列表") - @PostMapping("pager/base/v1/commoncontract/fetcist") + @PostMapping("pagerList") ResultBean> pagerList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app金融产品资方常规") From e67e087462b77686f909ca76df3219d1b39a0b28 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 8 Aug 2023 09:56:00 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppModelConfigDetailsVo.java | 20 +++++++++++++++++++ .../basemodelconfig/BaseModelConfigMapper.xml | 9 +++++++++ .../biz/basevehicle/BaseVehicleService.java | 9 +++++++++ 3 files changed, 38 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigDetailsVo.java index 6e36f51e42..e460d29ed2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigDetailsVo.java @@ -56,6 +56,26 @@ public class AppModelConfigDetailsVo implements Vo { @ApiModelProperty(value = "保险杠") private String bumper; + @ApiModelProperty("离合器value") + private String clutchValue; + @ApiModelProperty("方向机value") + private String dirMachineValue; + @ApiModelProperty("前桥value") + private String proponsValue; + @ApiModelProperty("门窗value") + private String doorAndWindowValue; + @ApiModelProperty("门锁value") + private String doorLockValue; + @ApiModelProperty("大灯value") + private String headlightValue; + @ApiModelProperty("上车踏板value") + private String boardPedalValue; + @ApiModelProperty("方向盘value") + private String steerWheelValue; + @ApiModelProperty("蓄电池value") + private String storagBatteryValue; + + @ApiModelProperty(value = "配置包") private String configuringBao; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index a353078074..3870677f1d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -343,6 +343,15 @@ bmc.saddle, bmc.wheelbase, bmc.bumper, + bmc.clutchValue, + bmc.dirMachineValue, + bmc.proponsValue, + bmc.doorAndWindowValue, + bmc.doorLockValue, + bmc.headlightValue, + bmc.boardPedalValue, + bmc.steerWheelValue, + bmc.storagBatteryValue, bmc.configuringBao, bmc.independentSources, bmc.fuelTank, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 339dce6849..385d3a7a67 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1087,6 +1087,15 @@ public class BaseVehicleService extends MybatisBaseService Date: Tue, 8 Aug 2023 10:41:52 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index 6980d7289f..a473a43432 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -5,7 +5,7 @@ select * from base_vehicle_state where busSid = #{busSid} - and busState != '602' + and (busState is null or busState != '602') order by id desc limit 1 From f1732c261a5b24aa3889f029c4519745109afa98 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 8 Aug 2023 13:32:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index a942ec9e86..b8585eaf46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -812,15 +812,13 @@ public class BusDeliveredApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { + Future future0 = pool.submit(() -> { List dtoList = new ArrayList<>(); List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid()); vinSidList.removeAll(Collections.singleton(null)); @@ -834,15 +832,6 @@ public class BusDeliveredApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); List detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); ResultBean orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo()); if (!orderDetailsVoResultBean.getSuccess()) { @@ -1012,6 +1001,7 @@ public class BusDeliveredApplyService extends MybatisBaseService Date: Tue, 8 Aug 2023 14:37:38 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyMapper.java | 3 +++ .../BusDeliveredApplyMapper.xml | 4 ++++ .../BusDeliveredApplyService.java | 22 +++++++++++++++++-- .../bussalesorder/BusSalesOrderService.java | 4 ++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index fbe76d9734..9dd0c5fd1a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery; import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; @@ -114,4 +115,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper { List selectSid(@Param("contractId") String contractId,@Param("sid") String sid); List selectBySid(@Param("contractNo") String contractId, @Param("list") List vinNoLists); + + BaseVehicleState selectByBusVinSid(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 31cfe33a84..bff15c354a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -155,4 +155,8 @@ #{item} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index b8585eaf46..8b875ee012 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -42,6 +42,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; @@ -993,9 +994,26 @@ public class BusDeliveredApplyService extends MybatisBaseService getSaleOrderDetailsByContractNo(String contractNo) { + ResultBean rb = ResultBean.fireFail(); BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo); + if(busSalesOrder == null){ + return rb.setMsg("该合同号的订单不存在"); + } ResultBean resultBean = getSaleOrderDetails(busSalesOrder.getSid()); return resultBean; } From e12f779ef533e3b7ebab06ad5a84072c45c725ba Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 8 Aug 2023 14:55:30 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 38 +++++++++++++++++++ .../BusDeliveredApplyDetailsService.java | 32 +++++----------- 2 files changed, 48 insertions(+), 22 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 8b875ee012..c8fc793928 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -2022,6 +2022,19 @@ public class BusDeliveredApplyService extends MybatisBaseService stateDtoList = new ArrayList<>(); + List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(vv -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey()); + baseVehicleStateDto.setBusSid(vv); + stateDtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList); + } + } else { //根据出库申请sid查询出库申请是否存在 BusDeliveredApply busDeliveredApply = fetchBySid(sid); @@ -2066,6 +2079,18 @@ public class BusDeliveredApplyService extends MybatisBaseService stateDtoList = new ArrayList<>(); + List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(vv -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey()); + baseVehicleStateDto.setBusSid(vv); + stateDtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList); + } //删除 busDeliveredApplyDetailsService.deleteByApplySid(sid); busDeliveredUseMessageService.deleteByApplySid(sid); @@ -2170,6 +2195,19 @@ public class BusDeliveredApplyService extends MybatisBaseService(); + vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + List finalStateDtoList = stateDtoList; + vinSidList.stream().forEach(vv -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey()); + baseVehicleStateDto.setBusSid(vv); + finalStateDtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList); + } } return rb.success().setData(sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java index 5aa8c6b121..39c57bd69d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java @@ -168,29 +168,17 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { - List stateDtoList = new ArrayList<>(); - List vinSidList = selectVinSidByApplySid(sid); - vinSidList.removeAll(Collections.singleton(null)); - if (!vinSidList.isEmpty()) { - vinSidList.stream().forEach(v -> { - BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); - baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey()); - baseVehicleStateDto.setBusSid(v); - stateDtoList.add(baseVehicleStateDto); - }); - ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList); - } + List stateDtoList = new ArrayList<>(); + List vinSidList = selectVinSidByApplySid(sid); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + stateDtoList.add(baseVehicleStateDto); }); - } catch (Exception e) { - e.printStackTrace(); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList); } } From 5252eaaca8a53e007a4c908787e639ffc077260e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 8 Aug 2023 15:05:54 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index c8fc793928..ae634f20bd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -2079,18 +2079,21 @@ public class BusDeliveredApplyService extends MybatisBaseService stateDtoList = new ArrayList<>(); List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); vinSidList.removeAll(Collections.singleton(null)); if (!vinSidList.isEmpty()) { + List finalStateDtoList1 = stateDtoList; vinSidList.stream().forEach(vv -> { BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey()); baseVehicleStateDto.setBusSid(vv); - stateDtoList.add(baseVehicleStateDto); + finalStateDtoList1.add(baseVehicleStateDto); }); ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList); } + //================================================================= //删除 busDeliveredApplyDetailsService.deleteByApplySid(sid); busDeliveredUseMessageService.deleteByApplySid(sid); From d85ab96ea0afeed04e69d58d461073fa8a0feae7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 8 Aug 2023 16:34:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finbillapplication/FinBillApplicationService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 12e951ec02..716ed3813c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -366,7 +366,9 @@ public class FinBillApplicationService extends MybatisBaseService