瀏覽代碼

no message

ly 1 年之前
父節點
當前提交
85e149475d

+ 3 - 1
src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -398,7 +398,9 @@ public class BizFinancialSalaryController extends BaseController {
                 financialKeepAccountDetail.setCompanyId(detail.getCompanyId());
                 List<BizFinancialSalaryDetailEmployee> employees = detail.getDetails();
                 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);
                 if (financialKeepAccountDetail.getId() == null) {
                     return financialKeepAccountDetailService.save(financialKeepAccountDetail);