diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 902bba4524..2f0bb293eb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -684,6 +684,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService flowList = flowRecordVo.getFlowList(); - List finPaymentrecordSourceLCVos = new ArrayList<>(); - for (FlowTask flowTask : flowList) { - FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); - finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); - finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); - finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd")); - finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); - } - dataMap.put("lcList", finPaymentrecordSourceLCVos); - //获取附件名称(文档类型) - CommonAppendixVo contract = baseOutsourcingApplicationDetailsVo.getContract(); - if (contract != null) { - dataMap.put("fileName", contract.getFileName()); + if (baseOutsourcingApplicationDetailsVo != null) { + if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) { + dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode()); + //获取审批记录 + FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData(); + List flowList = flowRecordVo.getFlowList(); + List finPaymentrecordSourceLCVos = new ArrayList<>(); + for (FlowTask flowTask : flowList) { + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); + finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd")); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + dataMap.put("lcList", finPaymentrecordSourceLCVos); + //获取附件名称(文档类型) + CommonAppendixVo contract = baseOutsourcingApplicationDetailsVo.getContract(); + if (contract != null) { + dataMap.put("fileName", contract.getFileName()); + } } - } else if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) { - dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode()); - //获取审批记录 - FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData(); - List flowList = flowRecordVo.getFlowList(); - List finPaymentrecordSourceLCVos = new ArrayList<>(); - for (FlowTask flowTask : flowList) { - FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); - finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); - finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); - finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd")); - finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + if (busVehicleApplyDetailsVo != null) { + if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) { + dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode()); + //获取审批记录 + FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData(); + List flowList = flowRecordVo.getFlowList(); + List finPaymentrecordSourceLCVos = new ArrayList<>(); + for (FlowTask flowTask : flowList) { + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); + finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd")); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + dataMap.put("lcList", finPaymentrecordSourceLCVos); } - dataMap.put("lcList", finPaymentrecordSourceLCVos); } dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(), "yyyy-MM-dd")); dataMap.put("createByName", createByName);