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

fix人员同步

This commit is contained in:
钱涛 2022-06-15 09:29:43 +08:00
parent 926bfbce16
commit 8d6a3c41d7
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resource/sql/薪资还原脚本.sql
View File

@ -76,6 +76,7 @@ delete from hrsa_scheme_detail where 1=1
delete from hrsa_social_archives where 1=1
;
delete from hrsa_social_security_scheme where 1=1
;
delete from hrsa_sys_tax_rate_base where 1=1

2
src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
View File

@ -322,7 +322,7 @@
FROM
hrmresource e
LEFT JOIN hrmdepartment d ON e.departmentid = d.ID
where e.accounttype is null
where e.accounttype is null or e.accounttype = 0
)a
LEFT JOIN(
SELECT

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

@ -654,8 +654,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
private String userStateExchange(String userState) {
UserStatusEnum[] values = UserStatusEnum.values();
for (UserStatusEnum value : values) {
if (value.getDescription().equals(userState)) {
return value.getValue() + "";
if (value.getValue().equals(Integer.valueOf(userState))) {
return value.getDescription() + "";
}
}
return userState;

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

@ -6,6 +6,7 @@ import com.engine.salary.enums.taxagent.TaxAgentEmpChangeModuleEnum;
import com.engine.salary.mapper.taxagent.TaxAgentEmpChangeMapper;
import com.engine.salary.service.TaxAgentEmpChangeService;
import com.engine.salary.util.db.MapperProxyFactory;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import javax.annotation.Resource;
@ -49,6 +50,7 @@ public class TaxAgentEmpChangeServiceImpl extends Service implements TaxAgentEmp
@Override
public void batchInsert(List<TaxAgentEmpChangePO> taxAgentEmpChangeList) {
getTaxAgentEmpChangeMapper().batchInsert(taxAgentEmpChangeList);
List<List<TaxAgentEmpChangePO>> partition = Lists.partition(taxAgentEmpChangeList, 100);
partition.forEach(getTaxAgentEmpChangeMapper()::batchInsert);
}
}

6
src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java
View File

@ -141,11 +141,13 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic
// 关联表====================================================
// 新增
if (CollectionUtils.isNotEmpty(taxAgentEmployeeAddList)) {
getTaxAgentEmpMapper().batchInsert(taxAgentEmployeeAddList);
List<List<TaxAgentEmpPO>> partition = Lists.partition(taxAgentEmployeeAddList, 100);
partition.forEach(getTaxAgentEmpMapper()::batchInsert);
}
// 删除
if (CollectionUtils.isNotEmpty(taxAgentEmployeeDelIds)) {
getTaxAgentEmpMapper().deleteByIds(taxAgentEmployeeDelIds);
List<List<Long>> partition = Lists.partition(taxAgentEmployeeDelIds, 100);
partition.forEach(getTaxAgentEmpMapper()::deleteByIds);
}
// 增量表====================================================
if (CollectionUtils.isNotEmpty(taxAgentEmpChangeList)) {