Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -1141,6 +1141,16 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                     } else {
                         appCarListVo.setShowHandCarBtn(true);
                     }
+                    //根据合同和车辆sid获取欠款开票的信息
+                    BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
+                    if(busBillApplication != null){
+                        appCarListVo.setQkKpSid(busBillApplication.getSid());
+                        //根据欠款开票的编号查询
+                        FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
+                        if(finBillApplication != null){
+                            appCarListVo.setQkLpSid(finBillApplication.getSid());
+                        }
+                    }
                     //优惠包使用情况
                     List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
                     List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -104,6 +104,7 @@ import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService;
 import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
 import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
@@ -1245,6 +1246,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appMap.put("outboundSid", bv.getBusinessSid());
         appMap.put("contractId", busDeliveredApply.getContractNo());
         appMap.put("contract_id", busDeliveredApply.getContractNo());
+        appMap.put("type", 2);
         variables.put("app", appMap);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
         flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@@ -4568,6 +4570,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 } else {
                     appCarListVo.setShowHandCarBtn(false);
                 }
+                //根据合同和车辆sid获取欠款开票的信息
+                BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
+                if(busBillApplication != null){
+                    appCarListVo.setQkKpSid(busBillApplication.getSid());
+                    //根据欠款开票的编号查询
+                    FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
+                    if(finBillApplication != null){
+                        appCarListVo.setQkLpSid(finBillApplication.getSid());
+                    }
+                }
 
                 //优惠包使用情况
                 List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -716,6 +716,9 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             Map<String, Object> flowMap = f.getProcessVariables();
             f.setBusinessSid(flowMap.get("businessSid").toString());
             Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
+            if("process_161otrwo:2:5642504".equals(proDefId)){
+                appMap.put("type",2);
+            }
             String json = JSONObject.toJSONString(appMap);
             AppVo appVo = new AppVo();
             appVo.setJson(json);