优化代码提交

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -555,11 +555,11 @@ public class NoCarServiceImpl implements NoCarService{
             billInvoices.stream().forEach(billInvoice -> {
                 InvoiceProcessingListModel invoiceProcessingListModel = new InvoiceProcessingListModel();
                 BeanUtils.copyProperties(billInvoice,invoiceProcessingListModel);
-                invoiceProcessingListModel.setExTime(DateUtil.dateToTime(invoiceProcessingListModel.getExTime()));
-                invoiceProcessingListModel.setInvoiceMakeTime(DateUtil.dateToTime(invoiceProcessingListModel.getInvoiceMakeTime()));
-                invoiceProcessingListModel.setTradeMatchTime(DateUtil.dateToTime(invoiceProcessingListModel.getTradeMatchTime()));
-                invoiceProcessingListModel.setWaybillStartTime(DateUtil.dateToTime(invoiceProcessingListModel.getWaybillStartTime()));
-                invoiceProcessingListModel.setWaybillEndTime(DateUtil.dateToTime(invoiceProcessingListModel.getWaybillEndTime()));
+                invoiceProcessingListModel.setExTime(invoiceProcessingListModel.getExTime()==null?null:DateUtil.dateToTime(invoiceProcessingListModel.getExTime()));
+                invoiceProcessingListModel.setInvoiceMakeTime(invoiceProcessingListModel.getInvoiceMakeTime()==null?null:DateUtil.dateToTime(invoiceProcessingListModel.getInvoiceMakeTime()));
+                invoiceProcessingListModel.setTradeMatchTime(invoiceProcessingListModel.getTradeMatchTime()==null?null:DateUtil.dateToTime(invoiceProcessingListModel.getTradeMatchTime()));
+                invoiceProcessingListModel.setWaybillStartTime(invoiceProcessingListModel.getWaybillStartTime()==null?null:DateUtil.dateToTime(invoiceProcessingListModel.getWaybillStartTime()));
+                invoiceProcessingListModel.setWaybillEndTime(invoiceProcessingListModel.getWaybillEndTime()==null?null:DateUtil.dateToTime(invoiceProcessingListModel.getWaybillEndTime()));
                 invoiceProcessingListModels.add(invoiceProcessingListModel);
             });
         }
@@ -705,11 +705,11 @@ public class NoCarServiceImpl implements NoCarService{
         BillInvoice billInvoice = new BillInvoice();
         BeanUtils.copyProperties(invoiceProcessingListModel,billInvoice);
         //设置时间
-        billInvoice.setExTime(DateUtil.tTimeToDate(billInvoice.getExTime()));
-        billInvoice.setInvoiceMakeTime(DateUtil.tTimeToDate(billInvoice.getInvoiceMakeTime()));
-        billInvoice.setWaybillEndTime(DateUtil.tTimeToDate(billInvoice.getWaybillEndTime()));
-        billInvoice.setTradeMatchTime(DateUtil.tTimeToDate(billInvoice.getTradeMatchTime()));
-        billInvoice.setWaybillStartTime(DateUtil.tTimeToDate(billInvoice.getWaybillStartTime()));
+        billInvoice.setExTime(billInvoice.getExTime()==null?null:DateUtil.tTimeToDate(billInvoice.getExTime()));
+        billInvoice.setInvoiceMakeTime(billInvoice.getInvoiceMakeTime()==null?null:DateUtil.tTimeToDate(billInvoice.getInvoiceMakeTime()));
+        billInvoice.setWaybillEndTime(billInvoice.getWaybillEndTime()==null?null:DateUtil.tTimeToDate(billInvoice.getWaybillEndTime()));
+        billInvoice.setTradeMatchTime(billInvoice.getTradeMatchTime()==null?null:DateUtil.tTimeToDate(billInvoice.getTradeMatchTime()));
+        billInvoice.setWaybillStartTime(billInvoice.getWaybillStartTime()==null?null:DateUtil.tTimeToDate(billInvoice.getWaybillStartTime()));
         return billInvoice;
     }