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

Merge branch 'release/2.16.1.2410.01' into release/个税版本

This commit is contained in:
钱涛 2024-10-18 16:49:44 +08:00
parent 47329fbcb9 af34b8a5b5
commit 24dad9d988
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
View File

@ -131,11 +131,10 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
@Override @Override
public List<Map<String, String>> getDatas(Attend4Salary attend4Salary) { public List<Map<String, String>> getDatas(Attend4Salary attend4Salary) {
ValidUtil.doValidator(attend4Salary);
log.info("salaryAttend开始获取的考勤数据，参数{}", attend4Salary);
List<Map<String, String>> list = new ArrayList<>(); List<Map<String, String>> list = new ArrayList<>();
try { try {
ValidUtil.doValidator(attend4Salary);
Map<String, Object> paramsMap = new HashMap<String, Object>(); Map<String, Object> paramsMap = new HashMap<String, Object>();
paramsMap.put("pageIndex", 1); paramsMap.put("pageIndex", 1);
paramsMap.put("pageSize", 500); paramsMap.put("pageSize", 500);
@ -152,6 +151,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
Map<String, Object> temp = new HashMap<String, Object>(); Map<String, Object> temp = new HashMap<String, Object>();
temp.put("data", JSONObject.toJSONString(paramsMap)); temp.put("data", JSONObject.toJSONString(paramsMap));
temp.put("reportType", "month"); temp.put("reportType", "month");
log.info("salaryAttend开始获取的考勤数据，参数{}", temp);
list = (List<Map<String, String>>) commandExecutor.execute(new GetKQReportCmd(temp, user)).get("datas"); list = (List<Map<String, String>>) commandExecutor.execute(new GetKQReportCmd(temp, user)).get("datas");
if (isLog) { if (isLog) {
log.info("salaryAttend获取的考勤数据，{}", JSONUtils.toJSONString(list)); log.info("salaryAttend获取的考勤数据，{}", JSONUtils.toJSONString(list));

2
src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
View File

@ -382,7 +382,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
List<Long> employeeIds = SalaryEntityUtil.properties(salaryEmployees, DataCollectionEmployee::getEmployeeId, Collectors.toList()); List<Long> employeeIds = SalaryEntityUtil.properties(salaryEmployees, DataCollectionEmployee::getEmployeeId, Collectors.toList());
List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salarySobCycleDTO.getSalaryCycle(), employeeIds, taxAgentId); List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salarySobCycleDTO.getSalaryCycle(), employeeIds, taxAgentId);
// 转换成薪资核算人员po // 转换成薪资核算人员po
Date salaryDate = SalaryDateUtil.dateStrToLocalTime(salaryYearMonth + "-01"); Date salaryDate = SalaryDateUtil.dateStrToLocalDate(salaryYearMonth + "-01");
List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = SalaryAcctEmployeeBO.convert2Employee(salaryEmployees, SalaryAcctRecordPO.builder().salarySobId(salarySobId).salaryMonth(salaryDate).build(), salaryArchiveDataDTOS, (long) user.getUID()); List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = SalaryAcctEmployeeBO.convert2Employee(salaryEmployees, SalaryAcctRecordPO.builder().salarySobId(salarySobId).salaryMonth(salaryDate).build(), salaryArchiveDataDTOS, (long) user.getUID());
//过滤掉不属于当前账套扣缴义务人的人员 //过滤掉不属于当前账套扣缴义务人的人员

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

@ -1261,10 +1261,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
if (param.getLockStatus() == LockStatusEnum.LOCK) { if (param.getLockStatus() == LockStatusEnum.LOCK) {
lockItemIds.add(salaryItemId); lockItemIds.add(salaryItemId);
} else { } else {
lockItemIds.remove(salaryItemId); lockItemIds.removeIf(salaryItemId::equals);
} }
salaryAcctEmployeePO.setLockItems(lockItemIds); salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO); getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
} }
@ -1291,7 +1291,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
} else { } else {
lockItemIds.removeAll(salaryItemIds); lockItemIds.removeAll(salaryItemIds);
} }
salaryAcctEmployeePO.setLockItems(lockItemIds); salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO); getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
}); });