发票移交,问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1998,6 +1998,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         dataMap.put("tPriceDX", tPriceDX);
         //获取审批记录
         AppDeliveredDetailsVo appDeliveredDetailsVo = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(baseVehicleOutApply.getBusSid()).getData();
+        if (appDeliveredDetailsVo == null){
+            return null;
+        }
         List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(appDeliveredDetailsVo.getProcInstId(), "1").getData();
         for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
             if (flowTask.getFlowableRecordVo() != null) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2676,6 +2676,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             createDate = DateUtil.formatDate(dateTime);
             record.setCreateDate(createDate);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
+            if (!"已办结".equals(busSalesOrder.getNodeState())){
+                continue;
+            }
             record.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             record.setSaleTypeValue(busSalesOrder.getPayType());
             BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery();