Merge branch 'develop'

src/main/java/cn/ezhizao/project/business/receiveTicket/controller/BizFinancialReceiveTicketController.java

@@ -379,7 +379,12 @@ public class BizFinancialReceiveTicketController extends BaseController {
                 Timestamp timestamp = new Timestamp(receiveDate.getTime());
                 financialKeepAccountDetail.setReceiveDate(timestamp);
                 financialKeepAccountDetail.setStatus(detail.getSumNumber().equals(0) && ((employees.size() == 1 && employees.stream().mapToDouble(v -> v.getActuallySalary().doubleValue()).sum() == 0) || (employees.isEmpty())) ? 2 : 1);
-                financialKeepAccountDetail.setReceiveDate((Timestamp) detail.getReceiveDate());
+//                financialKeepAccountDetail.setReceiveDate((Timestamp) detail.getReceiveDate());
+                Date receiveDate = detail.getReceiveDate();
+                if(receiveDate != null ){
+                    Timestamp timestamp = new Timestamp(receiveDate.getTime());
+                    financialKeepAccountDetail.setReceiveDate(timestamp);
+                }
 //                financialKeepAccountDetailService.saveOrUpdate(financialKeepAccountDetail);
                 if (financialKeepAccountDetail.getId() == null) {
                     return financialKeepAccountDetailService.save(financialKeepAccountDetail);

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -399,8 +399,10 @@ public class BizFinancialSalaryController extends BaseController {
                 List<BizFinancialSalaryDetailEmployee> employees = detail.getDetails();
                 financialKeepAccountDetail.setStatus(financialReceiveTicketDetail.getSumNumber().equals(0) && employees.stream().mapToDouble(v -> v.getActuallySalary().doubleValue()).sum() == 0 ? 2 : 1);
                 Date receiveDate = financialReceiveTicketDetail.getReceiveDate();
-                Timestamp timestamp = new Timestamp(receiveDate.getTime());
-                financialKeepAccountDetail.setReceiveDate(timestamp);
+                if(receiveDate != null){
+                    Timestamp timestamp = new Timestamp(receiveDate.getTime());
+                    financialKeepAccountDetail.setReceiveDate(timestamp);
+                }
 //                financialKeepAccountDetailService.saveOrUpdate(financialKeepAccountDetail);
                 if (financialKeepAccountDetail.getId() == null) {
                     return financialKeepAccountDetailService.save(financialKeepAccountDetail);