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