|
@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.receiveTicket.controller;
|
|
|
|
|
|
import java.sql.Timestamp;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.annotation.Resource;
|
|
@@ -373,7 +374,9 @@ public class BizFinancialReceiveTicketController extends BaseController
|
|
|
financialKeepAccountDetail.setCompanyId(detail.getCompanyId());
|
|
|
List<BizFinancialSalaryDetailEmployee> employees = financialSalaryDetailEmployeeService.query().eq("financial_salary_detail_id", financialSalaryDetail.getId()).list();
|
|
|
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());
|
|
|
+ Date receiveDate = detail.getReceiveDate();
|
|
|
+ Timestamp timestamp = new Timestamp(receiveDate.getTime());
|
|
|
+ financialKeepAccountDetail.setReceiveDate(timestamp);
|
|
|
// financialKeepAccountDetailService.saveOrUpdate(financialKeepAccountDetail);
|
|
|
if(financialKeepAccountDetail.getId() == null) {
|
|
|
return financialKeepAccountDetailService.save(financialKeepAccountDetail);
|