diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java index f5b8cbb..8b10b23 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java @@ -205,7 +205,8 @@ public class AccountCloseServiceImpl implements AccountCloseService { //结算情况 Order order = orderMapper.getOrderByBatchcode(uac.getBatchcode()); odumap.put("order_createtime", sdf.format(order.getCreatetime())); - odumap.put("order_completetime", sdf.format(order.getCompletetime())); + String odcompletetime= order.getCompletetime()==null?"-":sdf.format(order.getCompletetime()); + odumap.put("order_completetime", odcompletetime); odumap.put("close_status",order.getCloseStatus()); //uac 数据进行格式化