|
@@ -374,10 +374,6 @@ public class BizFinancialReceiveTicketController extends BaseController {
|
|
|
financialKeepAccountDetail.setMonth(detail.getMonth());
|
|
|
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);
|
|
|
- Date receiveDate = detail.getReceiveDate();
|
|
|
- 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());
|
|
|
Date receiveDate = detail.getReceiveDate();
|