Commit 802d8829 authored by huyuchen's avatar huyuchen

项目档案问题优化

parent 006e7aa5
...@@ -1522,6 +1522,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1522,6 +1522,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
a = new TSalaryAccount(); a = new TSalaryAccount();
try { try {
SalaryAccountUtil.reflectionAttr(savList.get(i), a); SalaryAccountUtil.reflectionAttr(savList.get(i), a);
a.setSalaryMonth(DateUtil.getThisMonth());
if (!haveSalaryFlag && a.getHaveSalaryFlag() != null && a.getHaveSalaryFlag() == CommonConstants.ONE_INT) { if (!haveSalaryFlag && a.getHaveSalaryFlag() != null && a.getHaveSalaryFlag() == CommonConstants.ONE_INT) {
haveSalaryFlag = true; haveSalaryFlag = true;
} }
...@@ -1598,7 +1599,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1598,7 +1599,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
account.setSaiList(null); account.setSaiList(null);
account.setOrderId(salary.getOrderId()); account.setOrderId(salary.getOrderId());
account.setSalaryFormId(salary.getId()); account.setSalaryFormId(salary.getId());
account.setSalaryMonth(DateUtil.getThisMonth());
tSalaryAccountService.save(account); tSalaryAccountService.save(account);
for (TSalaryAccountItem item : saiList) { for (TSalaryAccountItem item : saiList) {
item.setSalaryAccountId(account.getId()); item.setSalaryAccountId(account.getId());
......
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