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

解决冲突

This commit is contained in:
钱涛 2024-11-13 11:24:19 +08:00
parent 5a520a367a
commit 84aa4caf54
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
View File

@ -120,34 +120,34 @@ public class SalaryBillBO {
/**
* 构建工资单中的人员信息
*
* @param simpleEmployee
*/
public static void buildEmployeeInfo(SalaryBillSendDTO salaryBillSendParam, DataCollectionEmployee simpleEmployee) {
public static void buildEmployeeInfo(SalaryBillSendDTO salaryBillSendParam, Map<String, Object> empInfo) {
SalaryTemplateSalaryItemSetListDTO employeeInformation = salaryBillSendParam.getEmployeeInformation();
Map<String, String> employeeField = salaryBillSendParam.getEmployeeField();
if (employeeInformation == null || simpleEmployee == null) {
if (employeeInformation == null || empInfo == null) {
return;
}
if (CollectionUtils.isNotEmpty(employeeInformation.getItems())) {
//获取员工信息的字段名和中文描述的map关系
SalaryFormulaEmployeeDTO salaryFormulaEmployeeDTO = SalaryFormulaEmployeeDTO.builder()
.employeeId(simpleEmployee.getEmployeeId())
.taxAgentName(salaryBillSendParam.getTaxAgentName())
.departmentName(simpleEmployee.getDepartmentName())
.companystartdate(simpleEmployee.getCompanystartdate())
.email(StringUtils.isEmpty(simpleEmployee.getEmail()) ? "" : simpleEmployee.getEmail())
.sex(simpleEmployee.getSex() == null ? "" : simpleEmployee.getSex())
.mobile(StringUtils.isEmpty(simpleEmployee.getMobile()) ? "" : simpleEmployee.getMobile()).jobtitleName(simpleEmployee.getJobtitleName())
.status(StringUtils.isEmpty(simpleEmployee.getStatus()) ? "" : simpleEmployee.getStatus())
.telephone(StringUtils.isEmpty(simpleEmployee.getTelephone()) ? "" : simpleEmployee.getTelephone())
.username(StringUtils.isEmpty(simpleEmployee.getUsername()) ? "" : simpleEmployee.getUsername())
.workcode(simpleEmployee.getWorkcode())
.idNo(simpleEmployee.getIdNo())
.statusName(simpleEmployee.getStatusName())
.accountType(simpleEmployee.getAccountType())
.accountTypeName(simpleEmployee.getAccountTypeName())
.employeeId((long) empInfo.getOrDefault("employeeId", 0L))
.taxAgentName(Util.null2String(empInfo.get("taxAgentName")))
.departmentName(Util.null2String(empInfo.get("departmentName")))
.companystartdate(Util.null2String(empInfo.get("companystartdate")))
.email(Util.null2String(empInfo.get("email")))
.sex(Util.null2String(empInfo.get("sex")))
.mobile(Util.null2String(empInfo.get("mobile")))
.jobtitleName(Util.null2String(empInfo.get("jobtitleName")))
.status(Util.null2String(empInfo.get("status")))
.telephone(Util.null2String(empInfo.get("telephone")))
.username(Util.null2String(empInfo.get("username")))
.workcode(Util.null2String(empInfo.get("workcode")))
.idNo(Util.null2String(empInfo.get("idNo")))
.statusName(Util.null2String(empInfo.get("statusName")))
// .accountType((Integer) empInfo.getOrDefault("accountType",0))
.accountTypeName(Util.null2String(empInfo.get("accountTypeName")))
.build();
List<SalaryTemplateSalaryItemListDTO> items = employeeInformation.getItems();
for (SalaryTemplateSalaryItemListDTO e : items) {

3
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -1122,6 +1122,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
map.put("jobcallId", hrmDepartmentComInfo.getJobcallId());
map.put("birthday", hrmDepartmentComInfo.getBirthday());
map.put("accountType", hrmDepartmentComInfo.getAccountType());
map.put("accountTypeName", hrmDepartmentComInfo.getAccountTypeName());
// map.put("employeeType", SalarySendEmployeeTypeEnum.getNameByValue(e.getEmployeeType()));
// 单个人的核算数据
List<SalaryAcctResultPO> resultValues = Lists.newArrayList();