优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -219,6 +219,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppDisAndCustm>> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) {
+        return null;
+    }
+
     @Override
     public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
         return null;

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

@@ -1022,7 +1022,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                         finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
                                         finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
                                         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData();
-                                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                        if (finCompanyInvoicingDetailsVo != null) {
                                             finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                             finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                             finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@@ -1030,8 +1030,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                             finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
                                         } else {
                                             CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
-                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                            if (crmCustomerTempVo != null){
+                                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                            }
                                         }
                                         finVehicleInvoiceDto.setIsTakeTicket("是");
                                         finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2461,7 +2461,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         flowProcessMapQuery.setProDefKey(bv.getModelId());
         flowProcessMapQuery.setVariables(variables);
         flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
-        variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+        flowProcessMapQuery.setIsLP(finBillApplication.getIsLQOrigInvoice());
+        variables = flowableFeign.getMapQKKP(flowProcessMapQuery).getData();
         bv.setFormVariables(variables);
         //=======================================
         if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -452,7 +452,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.eq("openTickTypeKey",invoiceKey);
+        qw.eq("invoiceTypeKey",invoiceKey);
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -461,7 +461,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.eq("openTickTypeKey",invoiceKey);
+        qw.eq("invoiceTypeKey",invoiceKey);
         qw.like("name", search);
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcessMapQuery.java

@@ -19,4 +19,7 @@ public class FlowProcessMapQuery {
     private Map<String, Object> variables;
     @ApiModelProperty("流程id")
     private String proDefKey;
+
+    @ApiModelProperty("是否领票（欠款开票使用）")
+    private String isLP;
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@@ -151,4 +151,9 @@ public interface FlowableFeign {
     @PostMapping(value = "/getMap")
     @ResponseBody
     ResultBean<Map<String,Object>> getMap(@RequestBody FlowProcessMapQuery query);
+
+    @ApiOperation(value = "获取map")
+    @PostMapping(value = "/getMapQKKP")
+    @ResponseBody
+    ResultBean<Map<String,Object>> getMapQKKP(@RequestBody FlowProcessMapQuery query);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -963,4 +963,19 @@ public class FlowableRest implements FlowableFeign {
         variables.put("orderNames", orderNames);
         return rb.success().setData(variables);
     }
+
+    @Override
+    public ResultBean<Map<String, Object>> getMapQKKP(FlowProcessMapQuery query) {
+        ResultBean<Map<String, Object>> rb = ResultBean.fireFail();
+        Map<String, Object> variables = query.getVariables();
+        String contractNo = query.getContractNo();
+        String orderNames = "";
+        if ("是".equals(query.getIsLP())){
+            orderNames = contractNo + "欠款开票及领手续申请";
+        }else {
+            orderNames = contractNo + "欠款开票申请";
+        }
+        variables.put("orderNames", orderNames);
+        return rb.success().setData(variables);
+    }
 }