From f0a980fda7191c2fff8d19f9cd4a44cc83c9df3e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 20 Dec 2023 11:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=BA=E7=BB=88=E6=AD=A2=E9=87=8A=E6=94=BE=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finbillapplication/FinBillApplicationService.java | 2 ++
 .../anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java    | 3 +++
 .../anrui/fin/biz/finbillvehicle/FinBillVehicleService.java   | 4 ++++
 .../FinFundsCarriedForwardApplyService.java                   | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

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 7d430ffdef..b4156960d4 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
@@ -1351,6 +1351,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 finBillVehicleService.updateByMainSid(finBillApplication.getSid());
+                finBillVehicleService.updateByMainSid1(finBillApplication.getSid());
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -1374,6 +1375,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                     baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                     finBillVehicleService.updateByMainSid(finBillApplication.getSid());
+                    finBillVehicleService.updateByMainSid1(finBillApplication.getSid());
                     return rb.success().setData(resultBean.getData());
                 }
             }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
index 481242889c..55049081ed 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
@@ -85,4 +85,7 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
     List<String> fetchByUseOrgSid(@Param(Constants.WRAPPER) Wrapper<FinBillVehicle> qw);
 
     int checkIsKp(@Param("contractNo") String contractNo,@Param("vehSid") String vehSid);
+
+	@Update("UPDATE fin_bill_vehicle SET isDelete = 1 WHERE billAppSid = #{sid}")
+	void updateByMainSid1(String sid);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
index 634d9b547d..9354f5ee75 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
@@ -165,4 +165,8 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
     public int checkIsKp(String contractNo, String vehSid) {
         return baseMapper.checkIsKp(contractNo,vehSid);
     }
+
+    public void updateByMainSid1(String sid) {
+        baseMapper.updateByMainSid1(sid);
+    }
 }
\ No newline at end of file
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 e3fe3bb8f8..f9463da2d3 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
@@ -627,10 +627,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }else {
                 balance = finSelectedReceivablesDetailedService.getBalance(busSid);
             }
-            /*int i = new BigDecimal(balance).compareTo(new BigDecimal(thisUseMoney));
+            int i = new BigDecimal(balance).compareTo(new BigDecimal(thisUseMoney));
             if (i == -1){
                 return rb.setMsg("本次使用金额不能大于剩余金额");
-            }*/
+            }
             jzjehj = jzjehj.add(new BigDecimal(thisUseMoney));
         }
         for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {