优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1223,6 +1223,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
             busMainDeposit = fetchBySid(businessSid);
+            if ("Event_end".equals(ufVo.getTaskDefKey())) {
+                pushFin(businessSid);
+            }else{
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -1246,7 +1249,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-
+            }
             return voResultBean;
         }
         if (r == 2) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -2588,6 +2588,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finSelectedReceivablesDetailed.setSubscriptionMoney(confirmation.getCollectionMoney());
         finSelectedReceivablesDetailed.setUseOrgSid(confirmation.getUseOrgSid());
         finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
+        finSelectedReceivablesDetailed.setPurchaseSystemSid(confirmation.getPurchaseSystemSid());
+        finSelectedReceivablesDetailed.setPurchaseSystemName(confirmation.getPurchaseSystemName());
         finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
         if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
             //添加进附件表
@@ -2769,6 +2771,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         });
         confirmation.setAuditState(4);
         confirmation.setReason("申请人已撤回");
+        confirmation.setConfirmDate("");
+        confirmation.setConfirmName("");
+        confirmation.setConfirmNameSid("");
         baseMapper.updateById(confirmation);
         return rb.success().setMsg("撤回成功");
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -1453,6 +1453,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             for (FinFundsCarriedForwardVeh v : finFundsCarriedForwardVehList) {
                 String busSid = v.getBusSid();
                 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
+                if(StringUtils.isNotBlank(finSelectedReceivablesDetailed.getReceivablesSid())){
                     FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                     //结转金额
                     //查询该车的所有认款，是否都已认完
@@ -1472,6 +1473,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         dtoList.add(baseVehicleStateDto);
                     }
                 }
+
+            }
         }
         List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectByOneCollSid(sid);
         finSelectedReceivablesDetailedVos.removeAll(Collections.singleton(null));