修改问题

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -1343,7 +1343,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             BigDecimal wMoneyAll = BigDecimal.ZERO;
             //=================================================
             BusSalesOrder busSalesOrder = busSalesOrderService.selectDetailsByContractNo(dto.getContractId());
-            if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+            if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {//贷款、三方金融
+                //ToDo:
                 //根据销售订单sid查询金融方案
                 ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
                 SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();

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

@@ -190,7 +190,7 @@
     </select>
 
     <select id="selectCollectionMoneys" resultType="java.lang.String">
-        select sum(fsd.subscriptionMoney) from fin_selected_receivables_detailed fsd left join
+        select ifnull(sum(fsd.subscriptionMoney),0) from fin_selected_receivables_detailed fsd left join
         fin_uncollected_receivables_detailed fusd on fusd.sid = fsd.receivablesSid
         where fsd. auditState = 3 and fusd.busVinSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -28,7 +28,8 @@ public enum ProcDefEnum {
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:7:3100008"),
-    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"),
+//    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"),
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:10:4035008"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
     BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),