Commit 9ee6a40c authored by hongguangwu's avatar hongguangwu

劳务费加暂停发

parent 3908cb9f
......@@ -1601,15 +1601,46 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
auditLogService.save(tApprovalRecord);
TPauseSalary ps;
int i =1;
BigDecimal money;
LocalDateTime nowTime = LocalDateTime.now();
for (TSalaryAccount account : aList) {
saiList = account.getSaiList();
account.setSaiList(null);
account.setOrderId(salary.getOrderId());
account.setSalaryFormId(salary.getId());
account.setRowIndex(i);
i++;
tSalaryAccountService.save(account);
money = SalaryConstants.B_ZERO;
for (TSalaryAccountItem item : saiList) {
if (SalaryConstants.ACTUAL_SALARY_SUM_JAVA.equals(item.getJavaFiedName())) {
money = item.getSalaryMoney();
}
item.setSalaryAccountId(account.getId());
tSalaryAccountItemService.save(item);
// 暂停发
}
//暂停发
if (SalaryConstants.SALARY_GIVE_TIME_VALUE.equals(account.getSalaryGiveTime())) {
ps = new TPauseSalary();
ps.setBalance(money);
ps.setName(account.getEmpName());
ps.setIdCard(account.getEmpIdcard());
ps.setBankName(account.getBankName());
ps.setBankNo(account.getBankNo());
ps.setCreateTime(nowTime);
ps.setCreateBy(user.getId());
ps.setSettleDepartId(dept.getId());
ps.setSettleDepartNo(dept.getDepartNo());
ps.setSettleDepartName(dept.getDepartName());
ps.setSalaryFormId(salary.getId());
ps.setSalaryAccountId(account.getId());
ps.setSalaryDate(account.getSalaryMonth());
ps.setSettleDate(account.getSettlementMonth());
ps.setType(SalaryConstants.PAUSE_TYPE[0]);
tPauseSalaryService.save(ps);
}
}
......@@ -1881,12 +1912,15 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
auditLogService.save(tApprovalRecord);
int i =1;
for (TSalaryAccount account : aList) {
saiList = account.getSaiList();
account.setSaiList(null);
account.setOrderId(salary.getOrderId());
account.setSalaryFormId(salary.getId());
account.setRowIndex(i);
tSalaryAccountService.save(account);
i++;
for (TSalaryAccountItem item : saiList) {
item.setSalaryAccountId(account.getId());
tSalaryAccountItemService.save(item);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment