开票申请申请人终止释放车辆优化

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());
                 }
             }

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);
 }

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);
+    }
 }

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) {