Merge remote-tracking branch 'origin/master'

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

@@ -84,7 +84,7 @@ public enum ProcDefEnum {
     LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"),
     ENTERPRISEAPPLY("定点企业备案", "process_tvywp9ri:2:14197516"),
     JTTXCYSQ("金融贴息差异调整申请", "process_q1yy2tlg:2:16682508"),
-    LOANSECONDARYSALESNOTAPPLY("二次销售车辆不追偿申请", ""),
+    LOANSECONDARYSALESNOTAPPLY("二次销售车辆不追偿申请", "process_4q5mswag:1:19695004"),
 
     /******************************测试流程id*********************************************/
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java

@@ -214,10 +214,12 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
             loanBeCollectionVehFiles.add(loanBeCollectionVehFile1);
             //开票管理sid
             FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
-            LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
-            loanBeCollectionVehFile2.setName("开票信息");
-            loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
-            loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
+            if (finVehicleInvoice != null){
+                LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
+                loanBeCollectionVehFile2.setName("开票信息");
+                loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
+                loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
+            }
             //月还明细sid
             LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();
             loanBeCollectionVehFile3.setName("月还明细");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java

@@ -435,6 +435,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
         variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.LOANSECONDARYSALESNOTAPPLY.getProDefId());
+        //判断坏账金额是否大于2000
+        variables.put("ishz", loanSecondarySalesNotApply.getLossPrice().compareTo(new BigDecimal("2000")) == 1);
         bv.setFormVariables(variables);
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
@@ -515,6 +517,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(loanSecondarySalesNotApply.getOrgSidPath());
+        bv.setModelId(loanSecondarySalesNotApply.getProcDefId());
         if (bv.getTaskId().equals(loanSecondarySalesNotApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {