qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into custom/艾志工业

This commit is contained in:
Harryxzy 2024-03-12 13:28:12 +08:00
parent 17b65fca28 afb4bfd7ad
commit 32f8e8a828
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
View File

@ -430,7 +430,8 @@
t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization,
t.social_payment_base_string, t.fund_payment_base_string, t.other_payment_base_string,
t.social_payment_com_base_string, t.fund_payment_com_base_string, t.other_payment_com_base_string
t.social_payment_com_base_string, t.fund_payment_com_base_string, t.other_payment_com_base_string,
t.payment_status
FROM
hrsa_bill_detail t
WHERE t.delete_type = 0
@ -445,7 +446,8 @@
t.fund_per_json,t.fund_com_json,t.other_per_json,
t.other_com_json,t.social_per_sum,t.social_com_sum,
t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization
t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization,
t.payment_status
FROM
hrsa_bill_detail t
WHERE t.delete_type = 0

4
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -1225,7 +1225,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (StringUtils.equals("importExcelAcctResult", importType)
&& (employeeId != null && employeeId > 0)
&& (taxAgentId != null && taxAgentId > 0)
&& i == data.size() - 1
&& j == headers.size() - 1
&& !salaryAcctEmployeeMap.containsKey(employeeId + "-" + taxAgentId)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
@ -1238,7 +1238,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (StringUtils.equals("importSalaryAcctResult", importType)
&& (employeeId != null && employeeId > 0)
&& (taxAgentId != null && taxAgentId > 0)
&& i == data.size() - 1
&& j == headers.size() - 1
&& !salaryAcctEmployeeMap.containsKey(employeeId + "-" + taxAgentId)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();