qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
weaver-hrm-salary/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java

787 lines
47 KiB
Java
Raw Normal View History

核算v2
2022-04-08 19:08:59 +08:00
package com.engine.salary.entity.salaryacct.bo;
补充列
2022-04-19 15:13:08 +08:00
import com.engine.salary.annotation.SalaryFormulaVar;
字段分类
2022-04-27 18:29:38 +08:00
import com.engine.salary.component.WeaTableColumnGroup;
核算v2
2022-04-08 19:08:59 +08:00
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryacct.dto.ConsolidatedTaxDetailDTO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctEmployeeInfoDTO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultDetailDTO;
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultListColumnDTO;
核算v2
2022-04-08 19:08:59 +08:00
import com.engine.salary.entity.salaryacct.param.SalaryAcctResultSaveParam;
import com.engine.salary.entity.salaryacct.po.*;
import com.engine.salary.entity.salaryformula.dto.SalaryFormulaEmployeeDTO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.salarysob.dto.SalarySobEmpFieldDTO;
import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO;
import com.engine.salary.entity.salarysob.dto.SalarySobItemDTO;
import com.engine.salary.entity.salarysob.dto.SalarySobItemGroupDTO;
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
import com.engine.salary.entity.salarysob.po.*;
暂存
2022-05-31 16:41:11 +08:00
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
import com.engine.salary.enums.SalaryValueTypeEnum;
核算锁定
2022-11-17 15:17:49 +08:00
import com.engine.salary.enums.salaryaccounting.LockStatusEnum;
核算v2
2022-04-08 19:08:59 +08:00
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
import com.engine.salary.util.SalaryEntityUtil;
补充列
2022-04-19 15:13:08 +08:00
import com.engine.salary.util.SalaryI18nUtil;
自定义
2023-12-11 09:52:47 +08:00
import com.engine.salary.util.page.SalaryPageUtil;
核算v2
2022-04-08 19:08:59 +08:00
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils;
鲁控数字temp
2023-12-05 14:57:34 +08:00
import org.apache.commons.lang3.ObjectUtils;
核算v2
2022-04-08 19:08:59 +08:00
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.BeanUtils;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
线下对比
2022-05-26 15:45:37 +08:00
* 薪资核算结果
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
核算v2
2022-04-08 19:08:59 +08:00
public class SalaryAcctResultBO {
/**
支持人员可在多个扣缴单位
2022-07-14 10:36:51 +08:00
* 数据类型的后缀标识
核算v2
2022-04-08 19:08:59 +08:00
* 为了展示千分位，薪资核算结果列表、线上线下对比结果列表需要返回给前端列表字段的数据类型，字段索引+后缀标识
*/
private static final String DATA_TYPE_SUFFIX = "_type";
线下对比
2022-05-26 15:45:37 +08:00
// /**
// * 构建薪资核算结果列表的表头（线下对比）
// *
// * @param salarySobItemAggregateDTO
// * @return
// */
// public static List<WeaTableColumn> buildTableColumns4ComparisonResult(SalarySobItemAggregateDTO salarySobItemAggregateDTO, Set<Long> excludeSalaryItemIds) {
// List<WeaTableColumn> columns = Lists.newArrayList();
// // 员工信息字段
// for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
// columns.add(new WeaTableColumn("150", salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
// }
// // 薪资项目分组下的薪资项目
// for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {
// if (CollectionUtils.isEmpty(salarySobItemGroupDTO.getItems())) {
// continue;
// }
// for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) {
// if (excludeSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
// continue;
// }
// columns.add(new WeaTableColumn("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId()));
// }
// }
// // 没有分类的薪资项目
// for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) {
// if (excludeSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
// continue;
// }
// columns.add(new WeaTableColumn("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId()));
// }
// return columns;
// }
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
/**
* 构建薪资核算结果列表的表头（线下对比）
*
* @param salarySobItemAggregateDTO
* @return
*/
public static List<WeaTableColumnGroup> buildTableColumns4ComparisonResult(SalarySobItemAggregateDTO salarySobItemAggregateDTO, Set<Long> excludeSalaryItemIds) {
List<WeaTableColumnGroup> columns = Lists.newArrayList();
// 员工信息字段
for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
columns.add(new WeaTableColumnGroup("150", salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId(), salarySobEmpFieldDTO.getFieldId()));
}
// 薪资项目分组下的薪资项目
for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {
if (CollectionUtils.isEmpty(salarySobItemGroupDTO.getItems())) {
continue;
}
List<WeaTableColumnGroup> childrenColumns = Lists.newArrayList();
for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) {
if (excludeSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
continue;
}
childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), "" + salarySobItemDTO.getSalaryItemId()));
}
WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup("150", salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns);
columns.add(weaTableColumnWapper);
}
// 没有分类的薪资项目
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) {
if (excludeSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
continue;
}
columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), "" + salarySobItemDTO.getSalaryItemId()));
}
return columns;
}
核算v2
2022-04-08 19:08:59 +08:00
/**
线下对比
2022-05-26 15:45:37 +08:00
* 构建薪资核算结果列表的表头（线下对比）
核算v2
2022-04-08 19:08:59 +08:00
*
* @param salarySobItemAggregateDTO
* @return
*/
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
public static List<WeaTableColumnGroup> buildTableColumns4ComparisonResultByGroup(SalarySobItemAggregateDTO salarySobItemAggregateDTO, Set<Long> excludeSalaryItemIds) {
List<WeaTableColumnGroup> columns = Lists.newArrayList();
核算v2
2022-04-08 19:08:59 +08:00
// 员工信息字段
for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
columns.add(new WeaTableColumnGroup("150", salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId(), salarySobEmpFieldDTO.getFieldId()));
核算v2
2022-04-08 19:08:59 +08:00
}
// 薪资项目分组下的薪资项目
for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {
if (CollectionUtils.isEmpty(salarySobItemGroupDTO.getItems())) {
continue;
}
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
List<WeaTableColumnGroup> childrenColumns = Lists.newArrayList();
核算v2
2022-04-08 19:08:59 +08:00
for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) {
if (excludeSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
continue;
}
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), "" + salarySobItemDTO.getSalaryItemId()));
核算v2
2022-04-08 19:08:59 +08:00
}
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup("150", salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns);
columns.add(weaTableColumnWapper);
核算v2
2022-04-08 19:08:59 +08:00
}
// 没有分类的薪资项目
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) {
if (excludeSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
continue;
}
线下对比表头改造成分组的样式
2023-11-15 17:12:52 +08:00
columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), "" + salarySobItemDTO.getSalaryItemId()));
核算v2
2022-04-08 19:08:59 +08:00
}
return columns;
}
/**
* 构建薪资核算结果列表的表头
*
* @param salarySobItemAggregateDTO
* @return
*/
核算锁定
2022-11-17 15:17:49 +08:00
public static List<WeaTableColumnGroup> buildTableColumns(SalarySobItemAggregateDTO salarySobItemAggregateDTO, List<Long> lockSalaryItemIds) {
核算结果导出
2022-05-05 14:10:19 +08:00
List<WeaTableColumnGroup> columns = Lists.newArrayList();
核算v2
2022-04-08 19:08:59 +08:00
// 员工信息字段
for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
薪资项目宽度
2024-01-02 16:37:07 +08:00
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName(), 0), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
核算v2
2022-04-08 19:08:59 +08:00
}
// 薪资项目分组下的薪资项目
for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {
if (CollectionUtils.isEmpty(salarySobItemGroupDTO.getItems())) {
continue;
}
字段分类
2022-04-27 18:29:38 +08:00
List<WeaTableColumnGroup> childrenColumns = Lists.newArrayList();
核算v2
2022-04-08 19:08:59 +08:00
for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) {
核算锁定
2022-11-17 15:17:49 +08:00
if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
核算锁定
2022-11-17 15:17:49 +08:00
} else {
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
核算锁定
2022-11-17 15:17:49 +08:00
}
核算v2
2022-04-08 19:08:59 +08:00
}
薪资项目宽度
2024-01-02 16:37:07 +08:00
WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemGroupDTO.getName(), 0), salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns);
字段分类
2022-04-27 18:29:38 +08:00
columns.add(weaTableColumnWapper);
核算v2
2022-04-08 19:08:59 +08:00
}
// 没有分类的薪资项目
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) {
核算锁定
2022-11-17 15:17:49 +08:00
if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
核算锁定
2022-11-17 15:17:49 +08:00
} else {
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
核算锁定
2022-11-17 15:17:49 +08:00
}
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
}
// 回算的薪资项目
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getBackCalcItems()) {
if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), 0), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
} else {
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), 0), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
}
核算v2
2022-04-08 19:08:59 +08:00
}
return columns;
}
报表接口
2022-07-04 15:34:04 +08:00
/**
* 构建核算结果表头-供报表使用
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
2022-07-11 17:31:33 +08:00
*
报表接口
2022-07-04 15:34:04 +08:00
* @param salarySobItemAggregateDTO
* @return
*/
public static Map<String, Object> buildColumns(SalarySobItemAggregateDTO salarySobItemAggregateDTO) {
Map<String, Object> map = new HashMap<>();
// 员工信息字段
for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
map.put(salarySobEmpFieldDTO.getFieldId(), salarySobEmpFieldDTO.getFieldName());
}
// 薪资项目分组下的薪资项目
// 薪资项目分组下的薪资项目
for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {
if (CollectionUtils.isEmpty(salarySobItemGroupDTO.getItems())) {
continue;
}
for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) {
map.put(salarySobItemDTO.getSalaryItemId() + "", salarySobItemDTO.getName());
}
}
// 没有分类的薪资项目
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) {
map.put(salarySobItemDTO.getSalaryItemId() + "", salarySobItemDTO.getName());
}
return map;
}
核算v2
2022-04-08 19:08:59 +08:00
/**
* 转船成薪资核算结果列表的表格数据
*
* @param salaryItems
* @param salarySobEmpFields
* @param simpleEmployees
* @param salaryAcctEmployees
* @param salaryAccountingResults
* @param taxAgents
* @param consolidatedTaxSalaryAcctEmpIds
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
* @param customBackCalcParameters
* @param isBackCalc
核算v2
2022-04-08 19:08:59 +08:00
* @return
*/
public static List<Map<String, Object>> buildTableData(List<SalaryItemPO> salaryItems,
List<SalarySobEmpFieldPO> salarySobEmpFields,
List<DataCollectionEmployee> simpleEmployees,
List<SalaryAcctEmployeePO> salaryAcctEmployees,
List<SalaryAcctResultPO> salaryAccountingResults,
暂存
2022-05-31 16:41:11 +08:00
List<TaxAgentPO> taxAgents,
核算v2
2022-04-08 19:08:59 +08:00
Set<Long> consolidatedTaxSalaryAcctEmpIds,
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
Map<Long, String> customParameters,
Map<Long, String> customBackCalcParameters,
boolean isBackCalc) {
核算v2
2022-04-08 19:08:59 +08:00
if (CollectionUtils.isEmpty(salaryAcctEmployees)) {
return Collections.emptyList();
}
Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(simpleEmployees, DataCollectionEmployee::getEmployeeId);
Map<Long, List<SalaryAcctResultPO>> acctResultMap = SalaryEntityUtil.group2Map(salaryAccountingResults, SalaryAcctResultPO::getEmployeeId);
暂存
2022-05-31 16:41:11 +08:00
Map<Long, String> taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName);
核算v2
2022-04-08 19:08:59 +08:00
return salaryAcctEmployees.stream().map(e -> {
Map<Long, Object> resultValueMap = SalaryEntityUtil.convert2Map(acctResultMap.getOrDefault(e.getEmployeeId(), Collections.emptyList()),
SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getResultValue);
// 薪资项目的值
Map<String, Object> map = SalaryEntityUtil.convert2Map(salaryItems, o -> "" + o.getId(), o -> resultValueMap.getOrDefault(o.getId(), StringUtils.EMPTY));
// 薪资项目的字段类型（前端依据这个判断是否需要展示千分位）
Map<String, String> dataTypeMap = SalaryEntityUtil.convert2Map(salaryItems, salaryItemPO -> salaryItemPO.getId() + DATA_TYPE_SUFFIX, SalaryItemPO::getDataType);
map.putAll(dataTypeMap);
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
// TODO ?看一下如果不是回算这会不会有回算的东西?
核算v2
2022-04-08 19:08:59 +08:00
// 人员信息字段的值
Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()));
for (SalarySobEmpFieldPO salarySobEmpField : salarySobEmpFields) {
map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
// 员工信息字段的字段类型
map.put(salarySobEmpField.getFieldCode() + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue());
}
// 主键id
map.put("id", e.getId());
公式异常信息
2023-05-16 18:01:38 +08:00
//人员id
map.put("employeeId", e.getEmployeeId());
核算v2
2022-04-08 19:08:59 +08:00
// 个税扣缴义务人
String taxAgentName = taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY);
map.put("taxAgentName", taxAgentName);
// 是否属于"合并计税"的标记
map.put("consolidatedTaxation", StringUtils.isNotEmpty(taxAgentName) && consolidatedTaxSalaryAcctEmpIds.contains(e.getId()));
// 个税扣缴义务人的字段类型
map.put("taxAgentName" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue());
// 公式详情
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
customParameters.putAll(customBackCalcParameters);
核算v2
2022-04-08 19:08:59 +08:00
map.put("customParameters", customParameters);
return map;
}).collect(Collectors.toList());
}
/**
* 转转成薪资核算线下对比结果
*
* @param salaryItems
* @param salarySobEmpFields
* @param simpleEmployees
* @param salaryAcctEmployees
* @param salaryAcctResultPOS
* @param excelAcctResultPOS
* @param taxAgents
* @param consolidatedTaxSalaryAcctEmpIds
* @return
*/
public static List<Map<String, Object>> buildComparisonTableData(List<SalaryItemPO> salaryItems,
List<SalarySobEmpFieldPO> salarySobEmpFields,
List<DataCollectionEmployee> simpleEmployees,
List<SalaryAcctEmployeePO> salaryAcctEmployees,
List<SalaryAcctResultPO> salaryAcctResultPOS,
List<ExcelAcctResultPO> excelAcctResultPOS,
暂存
2022-05-31 16:41:11 +08:00
List<TaxAgentPO> taxAgents,
核算v2
2022-04-08 19:08:59 +08:00
Map<Long, String> customParameters,
Set<Long> consolidatedTaxSalaryAcctEmpIds,
Set<Long> includeSalaryItemIds) {
if (CollectionUtils.isEmpty(simpleEmployees)) {
return Collections.emptyList();
}
Map<Long, List<ExcelAcctResultPO>> excelResultMap = SalaryEntityUtil.group2Map(excelAcctResultPOS, ExcelAcctResultPO::getSalaryAcctEmpId);
Map<Long, List<SalaryAcctResultPO>> acctResultMap = SalaryEntityUtil.group2Map(salaryAcctResultPOS, SalaryAcctResultPO::getSalaryAcctEmpId);
暂存
2022-05-31 16:41:11 +08:00
Map<Long, String> taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName);
核算v2
2022-04-08 19:08:59 +08:00
Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(simpleEmployees, DataCollectionEmployee::getEmployeeId);
List<Map<String, Object>> resultList = Lists.newArrayListWithExpectedSize(salaryAcctEmployees.size());
for (SalaryAcctEmployeePO salaryAcctEmployee : salaryAcctEmployees) {
// 线下值和系统值之间是否存在差异
boolean different = false;
Map<String, Object> map = Maps.newHashMap();
// 员工信息字段的值
Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(salaryAcctEmployee.getEmployeeId()));
for (SalarySobEmpFieldPO salarySobEmpField : salarySobEmpFields) {
map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
// 员工信息字段的字段类型
map.put(salarySobEmpField.getFieldCode() + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue());
}
// 系统值
Map<Long, String> acctResultValueMap = SalaryEntityUtil.convert2Map(acctResultMap.getOrDefault(salaryAcctEmployee.getId(), Collections.emptyList()),
SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getResultValue);
// 线下值
Map<Long, String> excelResultValueMap = SalaryEntityUtil.convert2Map(excelResultMap.getOrDefault(salaryAcctEmployee.getId(), Collections.emptyList()),
ExcelAcctResultPO::getSalaryItemId, ExcelAcctResultPO::getResultValue);
// 薪资项目字段的值
for (SalaryItemPO salaryItem : salaryItems) {
Map<String, Object> temp = Maps.newHashMap();
// 系统值
String acctResultValue = acctResultValueMap.get(salaryItem.getId());
// 线下值
String excelResultValue = excelResultValueMap.get(salaryItem.getId());
temp.put("acctResultValue", acctResultValue);
temp.put("excelResultValue", excelResultValue);
map.put(String.valueOf(salaryItem.getId()), temp);
// 薪资项目字段的字段类型
map.put(salaryItem.getId() + DATA_TYPE_SUFFIX, salaryItem.getDataType());
SalaryDataTypeEnum dataTypeEnum = SalaryDataTypeEnum.parseByValue(salaryItem.getDataType());
if (dataTypeEnum == SalaryDataTypeEnum.STRING) {
if (!StringUtils.equals(acctResultValue, excelResultValue)) {
different = true;
includeSalaryItemIds.add(salaryItem.getId());
}
} else {
if (SalaryEntityUtil.empty2Zero(acctResultValue).compareTo(SalaryEntityUtil.empty2Zero(excelResultValue)) != 0) {
different = true;
includeSalaryItemIds.add(salaryItem.getId());
}
}
}
// 主键id
map.put("id", salaryAcctEmployee.getId());
// 个税扣缴义务人
String taxAgentName = taxAgentNameMap.getOrDefault(salaryAcctEmployee.getTaxAgentId(), StringUtils.EMPTY);
map.put("taxAgentName", taxAgentName);
// 个税扣缴义务人的字段类型
map.put("taxAgentName" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue());
// 是否属于"合并计税"的标记
map.put("consolidatedTaxation", StringUtils.isNotEmpty(taxAgentName) && consolidatedTaxSalaryAcctEmpIds.contains(salaryAcctEmployee.getId()));
// 薪资项目的公式详情（前端需要展示）
map.put("customParameters", customParameters);
// 是否存在差异的标记
map.put("different", different);
resultList.add(map);
}
return resultList;
}
/**
* 转换成薪资核算结果详情dto
*
* @param simpleEmployee
* @param taxAgentPO
* @param salaryAcctEmployee
* @param salarySobEmpFields
* @param salarySobItemPOS
* @param salaryItems
* @param salaryAcctResults
* @return
*/
public static SalaryAcctResultDetailDTO convert2DetailDTO(DataCollectionEmployee simpleEmployee,
暂存
2022-05-31 16:41:11 +08:00
TaxAgentPO taxAgentPO,
核算v2
2022-04-08 19:08:59 +08:00
SalaryAcctEmployeePO salaryAcctEmployee,
List<SalarySobEmpFieldPO> salarySobEmpFields,
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
List<SalarySobItemGroupPO> salarySobItemGroupPOS,
核算v2
2022-04-08 19:08:59 +08:00
List<SalarySobItemPO> salarySobItemPOS,
List<SalaryItemPO> salaryItems,
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
List<SalaryAcctResultPO> salaryAcctResults,
List<SalarySobBackItemPO> salarySobBackItemPOS,
List<SalaryItemPO> salaryBackItemPOS,
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
Map<Long, String> salaryBackItemFormula,
鲁控数字
2023-12-06 16:05:08 +08:00
Map<String, SalaryAcctResultListColumnDTO> formulaContentMap,
List<Long> lockItems) {
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
核算v2
2022-04-08 19:08:59 +08:00
// 员工信息字段
Map<String, String> employeeFieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(simpleEmployee);
// 个税扣缴义务人
暂存
2022-05-31 16:41:11 +08:00
employeeFieldValueMap.put("taxAgentName", Optional.ofNullable(taxAgentPO).map(TaxAgentPO::getName).orElse(StringUtils.EMPTY));
核算v2
2022-04-08 19:08:59 +08:00
Map<String, String> employeeFieldNameMap = buildEmployeeFieldName();
List<SalaryAcctEmployeeInfoDTO> employeeInfos = salarySobEmpFields.stream()
.map(e -> SalaryAcctEmployeeInfoDTO.builder()
.fieldName(employeeFieldNameMap.getOrDefault(e.getFieldCode(), StringUtils.EMPTY))
.fieldValue(employeeFieldValueMap.getOrDefault(e.getFieldCode(), StringUtils.EMPTY))
.build())
.collect(Collectors.toList());
// 薪资项目的值
Map<Long, String> resultValueMap = SalaryEntityUtil.convert2Map(salaryAcctResults, SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getResultValue);
Map<Long, SalaryItemPO> salaryItemMap = SalaryEntityUtil.convert2Map(salaryItems, SalaryItemPO::getId);
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
Map<Long, SalaryItemPO> salaryBackItemMap = SalaryEntityUtil.convert2Map(salaryBackItemPOS, SalaryItemPO::getId);
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
Map<Long, List<SalarySobItemPO>> salarySobItemPOMap = SalaryEntityUtil.group2Map(salarySobItemPOS, SalarySobItemPO::getSalarySobItemGroupId);
// 对分组进行排序
salarySobItemGroupPOS = sortGroup(salarySobItemGroupPOS);
// 对分组内薪资项目排序
sortItem(salarySobItemPOMap);
// 根据账套分组封装薪资项目的值
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO> itemsByGroup = new ArrayList<>();
自定义
2023-12-11 09:52:47 +08:00
for (SalarySobItemGroupPO groupPO : salarySobItemGroupPOS) {
List<SalarySobItemPO> groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(), Collections.emptyList());
if (CollectionUtils.isNotEmpty(groupItems)) {
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> items = groupItems.stream()
鲁控数字
2023-12-06 16:05:08 +08:00
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, lockItems))
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
.collect(Collectors.toList());
itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder()
.salarySobItemGroupId(groupPO.getId())
.salarySobItemGroupName(groupPO.getName())
.salaryItems(items)
自定义
2023-12-11 09:52:47 +08:00
.sortedIndex(groupPO.getSortedIndex()).build());
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
}
}
// 未分类
List<SalarySobItemPO> noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList());
自定义
2023-12-11 09:52:47 +08:00
if (CollectionUtils.isNotEmpty(noGroupItems)) {
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> items = noGroupItems.stream()
鲁控数字
2023-12-06 16:05:08 +08:00
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, lockItems))
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
.collect(Collectors.toList());
itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder()
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
.salarySobItemGroupId(0L)
.salarySobItemGroupName("未分类")
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
.salaryItems(items)
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
.sortedIndex(itemsByGroup.size()).build());
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
}
修复编辑薪资核算没有未分类
2023-05-25 17:06:03 +08:00
薪资核算 编辑列改造
2023-05-16 14:12:49 +08:00
// // 公式项的值（不根据salaryItemPO的valueType判断是因为薪资项目的valueType属性改变后并不会同步更新薪资账套中的薪资项目的formulaId字段）
// List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> formulaItems = salarySobItemPOS.stream()
// .filter(salarySobItemPO -> salarySobItemPO.getFormulaId() > 0)
// .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap))
// .collect(Collectors.toList());
// // 输入/导入项目的值
// List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> inputItems = salarySobItemPOS.stream()
// .filter(salarySobItemPO -> salarySobItemPO.getFormulaId() <= 0)
// .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap))
// .collect(Collectors.toList());
薪资账套修改回算公式后不生效问题
2022-12-14 22:34:12 +08:00
// // TODO 临时处理，后续删除，将已发补发加入输入、导入
// formulaItems.addAll(salarySobBackItemPOS.stream()
// .map(salarySobBackItemPO -> backItemConvert2SalaryAcctResultDetailItemDTO(salarySobBackItemPO, salaryBackItemMap.get(salarySobBackItemPO.getSalaryItemId()), resultValueMap, salaryBackItemFormula))
// .collect(Collectors.toList()));
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
// 已发/补发项目的值
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> issuedAndReissueItems = salarySobBackItemPOS.stream()
.map(salarySobBackItemPO -> backItemConvert2SalaryAcctResultDetailItemDTO(salarySobBackItemPO, salaryBackItemMap.get(salarySobBackItemPO.getSalaryItemId()), resultValueMap, salaryBackItemFormula))
.collect(Collectors.toList());
核算v2
2022-04-08 19:08:59 +08:00
return SalaryAcctResultDetailDTO.builder()
.id(salaryAcctEmployee.getId())
.employeeId(salaryAcctEmployee.getEmployeeId())
.employeeInfos(employeeInfos)
薪资核算 编辑列改造
2023-05-16 14:12:49 +08:00
// .formulaItems(formulaItems)
// .inputItems(inputItems)
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
.itemsByGroup(itemsByGroup)
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
.issuedAndReissueItems(issuedAndReissueItems)
核算v2
2022-04-08 19:08:59 +08:00
.build();
}
薪资核算导入 选择字段根据分类分组
2023-05-15 18:02:22 +08:00
public static List<SalarySobItemGroupPO> sortGroup(List<SalarySobItemGroupPO> salarySobItemGroupPOS) {
自定义
2023-12-11 09:52:47 +08:00
if (CollectionUtils.isEmpty(salarySobItemGroupPOS)) {
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
return Collections.emptyList();
}
return salarySobItemGroupPOS.stream().sorted(Comparator.comparingInt(SalarySobItemGroupPO::getSortedIndex)).collect(Collectors.toList());
}
/**
* 薪资账套的薪资项目按照sortedIndex排序
*/
薪资核算导入 选择字段根据分类分组
2023-05-15 18:02:22 +08:00
public static void sortItem(Map<Long, List<SalarySobItemPO>> salarySobItemPOMap) {
自定义
2023-12-11 09:52:47 +08:00
for (Map.Entry<Long, List<SalarySobItemPO>> entry : salarySobItemPOMap.entrySet()) {
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
List<SalarySobItemPO> items = entry.getValue();
if (CollectionUtils.isNotEmpty(items)) {
List<SalarySobItemPO> sortedValue = items.stream().sorted(Comparator.comparingInt(SalarySobItemPO::getSortedIndex)).collect(Collectors.toList());
salarySobItemPOMap.put(entry.getKey(), sortedValue);
}
}
}
核算v2
2022-04-08 19:08:59 +08:00
/**
* 转换成薪资核算结果详情dto
*
* @param salarySobItemPO
* @param salaryItemPO
* @param resultValueMap
* @return
*/
private static SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO convert2SalaryAcctResultDetailItemDTO(SalarySobItemPO salarySobItemPO,
SalaryItemPO salaryItemPO,
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
Map<Long, String> resultValueMap,
鲁控数字
2023-12-06 16:05:08 +08:00
Map<String, SalaryAcctResultListColumnDTO> formulaContentMap,
List<Long> lockItems) {
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“
2023-09-20 15:26:18 +08:00
SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(Optional.ofNullable(salarySobItemPO).map(SalarySobItemPO::getValueType).orElse(0));
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
String itemFormulaContent;
自定义
2023-12-11 09:52:47 +08:00
if (Objects.equals(salaryValueTypeEnum.getValue(), SalaryValueTypeEnum.FORMULA.getValue())) {
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
itemFormulaContent = Optional.ofNullable(formulaContentMap.get(salarySobItemPO.getSalaryItemId().toString())).map(SalaryAcctResultListColumnDTO::getFormulaContent).orElse("");
自定义
2023-12-11 09:52:47 +08:00
} else {
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
itemFormulaContent = salaryValueTypeEnum == null ? "" : salaryValueTypeEnum.getDefaultLabel();
}
核算v2
2022-04-08 19:08:59 +08:00
// 薪资项目的数据类型
return SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO.builder()
.salaryItemId(salarySobItemPO.getSalaryItemId())
.salaryItemName(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
.resultValue(resultValueMap.getOrDefault(salarySobItemPO.getSalaryItemId(), StringUtils.EMPTY))
.dataType(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue()))
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
.itemFormulaContent(itemFormulaContent)
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
// .canEdit(Objects.equals(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getUseInEmployeeSalary).orElse(0), 0))
.canEdit(true)
薪资档案、薪资核算编辑前端控制保留位数
2023-08-25 15:09:12 +08:00
.pattern(salarySobItemPO.getPattern())
鲁控数字
2023-12-06 16:05:08 +08:00
.lockStatus(lockItems.contains(salarySobItemPO.getSalaryItemId()) ? LockStatusEnum.LOCK.getValue() : LockStatusEnum.UNLOCK.getValue())
核算v2
2022-04-08 19:08:59 +08:00
.build();
}
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
/**
* 薪资回算项目转换成薪资核算结果详情dto
*
* @param salarySobBackItemPO
* @param salaryItemPO
* @param resultValueMap
* @return
*/
private static SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO backItemConvert2SalaryAcctResultDetailItemDTO(SalarySobBackItemPO salarySobBackItemPO,
SalaryItemPO salaryItemPO,
Map<Long, String> resultValueMap,
Map<Long, String> salaryBackItemFormula) {
// 薪资项目的数据类型
return SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO.builder()
.salaryItemId(salarySobBackItemPO.getSalaryItemId())
.salaryItemName(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
.resultValue(resultValueMap.getOrDefault(salarySobBackItemPO.getSalaryItemId(), StringUtils.EMPTY))
薪资核算编辑 带上公式
2023-05-16 15:41:11 +08:00
.itemFormulaContent(salaryBackItemFormula.get(salarySobBackItemPO.getSalaryItemId()))
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
.dataType(Optional.ofNullable(salarySobBackItemPO).map(SalarySobBackItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue()))
.canEdit(Objects.equals(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getUseInEmployeeSalary).orElse(0), 0))
.build();
}
核算v2
2022-04-08 19:08:59 +08:00
/**
* 薪资核算结果保存参数转换成薪资核算结果po
*
* @param saveParam 前端保存参数
* @param salaryAcctEmployee 薪资核算人员po
* @param employeeId 当前登陆人员id
* @return
*/
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
public static List<SalaryAcctResultPO> convert2PO(List<SalaryAcctResultPO> salaryAcctResultPOSOld,
SalaryAcctResultSaveParam saveParam,
核算v2
2022-04-08 19:08:59 +08:00
SalaryAcctEmployeePO salaryAcctEmployee,
Long employeeId) {
if (CollectionUtils.isEmpty(saveParam.getItems())) {
return Collections.emptyList();
}
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
// 获取薪资项目回算前的值
Map<String, String> salaryAcctResultOldPOMap = salaryAcctResultPOSOld.stream()
.collect(Collectors.groupingBy(p -> p.getSalaryAcctEmpId() + "-" + p.getSalaryItemId(),
Collectors.collectingAndThen(Collectors.maxBy(Comparator.comparing(SalaryAcctResultPO::getId)),
s -> s.map(SalaryAcctResultPO::getOriginResultValue).orElse(""))));
核算v2
2022-04-08 19:08:59 +08:00
Date now = new Date();
return saveParam.getItems().stream()
.map(e -> SalaryAcctResultPO.builder()
.salarySobId(salaryAcctEmployee.getSalarySobId())
.salaryItemId(e.getSalaryItemId())
.salaryAcctRecordId(salaryAcctEmployee.getSalaryAcctRecordId())
.salaryAcctEmpId(salaryAcctEmployee.getId())
.employeeId(salaryAcctEmployee.getEmployeeId())
.taxAgentId(salaryAcctEmployee.getTaxAgentId())
薪资核算编辑 手动编辑后自动锁定
2023-05-11 14:40:10 +08:00
.resultValue(StringUtils.trim(e.getResultValue()))
薪资回算-薪资核算部分（剩余核算归档）
2022-12-02 17:35:14 +08:00
.originResultValue(salaryAcctResultOldPOMap.get(saveParam.getSalaryAcctEmpId() + "-" + e.getSalaryItemId()))
核算v2
2022-04-08 19:08:59 +08:00
.creator(employeeId)
.createTime(now)
.updateTime(now)
.deleteType(NumberUtils.INTEGER_ZERO)
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
.build())
.collect(Collectors.toList());
}
鲁控数字temp
2023-12-05 14:57:34 +08:00
public static List<SalaryAcctResultPO> batchEditConvert2PO(Map<String, String> salaryAcctResultOldPOMap,
List<SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam> items,
SalaryAcctEmployeePO salaryAcctEmployee,
Long employeeId) {
if (CollectionUtils.isEmpty(items) || ObjectUtils.isEmpty(salaryAcctEmployee)) {
return Collections.emptyList();
}
Date now = new Date();
return items.stream()
.map(e -> SalaryAcctResultPO.builder()
.salarySobId(salaryAcctEmployee.getSalarySobId())
.salaryItemId(e.getSalaryItemId())
.salaryAcctRecordId(salaryAcctEmployee.getSalaryAcctRecordId())
.salaryAcctEmpId(salaryAcctEmployee.getId())
.employeeId(salaryAcctEmployee.getEmployeeId())
.taxAgentId(salaryAcctEmployee.getTaxAgentId())
.resultValue(StringUtils.trim(e.getResultValue()))
.originResultValue(salaryAcctResultOldPOMap.get(salaryAcctEmployee.getId() + "-" + e.getSalaryItemId()))
.creator(employeeId)
.createTime(now)
.updateTime(now)
.deleteType(NumberUtils.INTEGER_ZERO)
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
.build())
.collect(Collectors.toList());
}
核算v2
2022-04-08 19:08:59 +08:00
public static Map<String, String> buildEmployeeFieldName() {
Field[] declaredFields = SalaryFormulaEmployeeDTO.class.getDeclaredFields();
Map<String, String> employeeFieldNameMap = Maps.newHashMapWithExpectedSize(declaredFields.length);
补充列
2022-04-19 15:13:08 +08:00
for (Field declaredField : declaredFields) {
if (!declaredField.isAnnotationPresent(SalaryFormulaVar.class)) {
continue;
}
SalaryFormulaVar annotation = declaredField.getAnnotation(SalaryFormulaVar.class);
employeeFieldNameMap.put(declaredField.getName(), SalaryI18nUtil.getI18nLabel(annotation.labelId(), annotation.defaultLabel()));
}
核算v2
2022-04-08 19:08:59 +08:00
return employeeFieldNameMap;
}
public static ConsolidatedTaxDetailDTO convert2ConsolidatedTaxDetailDTO(DataCollectionEmployee simpleEmployee,
暂存
2022-05-31 16:41:11 +08:00
TaxAgentPO taxAgent,
核算v2
2022-04-08 19:08:59 +08:00
List<SalarySobEmpFieldPO> salarySobEmpFields,
List<SalaryItemPO> salaryItems,
List<SalaryAcctEmployeePO> salaryAcctEmployees,
List<SalarySobPO> salarySobs,
List<SalaryAcctRecordPO> salaryAcctRecords,
List<SalaryAcctResultPO> salaryAcctResults) {
return ConsolidatedTaxDetailDTO.builder()
核算基础类
2022-04-06 20:01:00 +08:00
// .employeeInfo(buildConsolidatedTaxationEmpInfo(simpleEmployee, taxAgent, salarySobEmpFields))
// .salaryAcctResult(buildConsolidatedTaxationAcctResult(salaryItems, salaryAcctEmployees, salarySobs, salaryAcctRecords, salaryAcctResults))
核算v2
2022-04-08 19:08:59 +08:00
.build();
}
/**
* 合并计税详情-员工信息
*
* @param simpleEmployee
* @param salarySobEmpFields
* @return
*/
// private static WeaForm buildConsolidatedTaxationEmpInfo(DataCollectionEmployee simpleEmployee, TaxAgent taxAgent, List<SalarySobEmpFieldPO> salarySobEmpFields) {
核算基础类
2022-04-06 20:01:00 +08:00
// Map<String, String> employeeFieldNameMap = buildEmployeeFieldName();
// Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(simpleEmployee);
// fieldValueMap.put("taxAgentName", taxAgent.getName());
// Map<String, Object> data = Maps.newHashMap();
// Map<String, WeaFormItem> items = Maps.newHashMap();
// List<List<WeaFormLayout>> layout = Lists.newArrayList();
// List<WeaFormLayout> temp = Lists.newArrayList();
// for (SalarySobEmpFieldPO field : salarySobEmpFields) {
// // 字段属性
// WeaFormItem weaFormItem = new WeaFormItem(WeaFormItemType.INPUT);
// weaFormItem.setReadOnly(true);
// weaFormItem.setValue(fieldValueMap.getOrDefault(field.getFieldCode(), ""));
// items.put(field.getFieldCode(), weaFormItem);
// // 字段布局
// if (temp.size() == 3) {
// layout.add(new ArrayList<>(temp));
// temp = Lists.newArrayList();
// }
// WeaFormLayout weaFormLayout = new WeaFormLayout(field.getFieldCode(), employeeFieldNameMap.getOrDefault(field.getFieldCode(), ""), new String[]{field.getFieldCode()});
// temp.add(weaFormLayout);
// // 字段的值
// data.put(field.getFieldCode(), weaFormItem.getValue());
// }
// if (CollectionUtils.isNotEmpty(temp)) {
// layout.add(new ArrayList<>(temp));
// }
// WeaForm weaForm = new WeaForm();
// weaForm.setData(data);
// weaForm.setItems(items);
// weaForm.setLayout(layout);
// return weaForm;
// }
核算v2
2022-04-08 19:08:59 +08:00
/**
* 合并计税详情-核算结果列表
*
* @param salaryItems
* @param salaryAcctResults
* @return
*/
核算基础类
2022-04-06 20:01:00 +08:00
// private static WeaTable<Map<String, Object>> buildConsolidatedTaxationAcctResult(List<SalaryItemPO> salaryItems,
// List<SalaryAcctEmployeePO> salaryAcctEmployees,
// List<SalarySobPO> salarySobs,
// List<SalaryAcctRecordPO> salaryAcctRecords,
// List<SalaryAcctResultPO> salaryAcctResults) {
// // 薪资核算人员
// Map<Long, SalaryAcctEmployeePO> salaryAcctEmployeeMap = SalaryEntityUtil.convert2Map(salaryAcctEmployees, SalaryAcctEmployeePO::getId);
// // 薪资账套
// Map<Long, String> salarySobNameMap = SalaryEntityUtil.convert2Map(salarySobs, SalarySobPO::getId, SalarySobPO::getName);
// // 薪资核算记录
// Map<Long, SalaryAcctRecordPO> salaryAcctRecordMap = SalaryEntityUtil.convert2Map(salaryAcctRecords, SalaryAcctRecordPO::getId);
// // 薪资核算结果
// Map<Long, List<SalaryAcctResultPO>> salaryAcctResultMap = SalaryEntityUtil.group2Map(salaryAcctResults, SalaryAcctResultPO::getSalaryAcctEmpId);
// List<WeaTableColumn> weaTableColumns = Lists.newArrayList(new WeaTableColumn("核算批次", "salarySobName"));
// weaTableColumns.addAll(salaryItems.stream()
// .map(e -> new WeaTableColumn(e.getName(), "" + e.getId(), false))
// .collect(Collectors.toList()));
// WeaTable<Map<String, Object>> weaTable = new WeaTable<>();
// weaTable.setTableType(WeaTableTypeEnum.NONE);
// weaTable.setCurrent(0);
// weaTable.setPageSize(salaryAcctResultMap.size());
// weaTable.setTotal(salaryAcctResultMap.size());
// weaTable.setColumns(weaTableColumns);
// if (CollectionUtils.isEmpty(salaryAcctResults)) {
// return weaTable;
// }
// List<Map<String, Object>> data = Lists.newArrayList();
// salaryAcctResultMap.forEach((k, v) -> {
// // 薪资核算的结果
// Map<String, Object> valueMap = SalaryEntityUtil.convert2Map(v, e -> "" + e.getSalaryItemId(), SalaryAcctResultPO::getResultValue);
// // 核算批次
// SalaryAcctEmployeePO salaryAcctEmployeePO = salaryAcctEmployeeMap.get(k);
// SalaryAcctRecordPO salaryAcctRecordPO = salaryAcctRecordMap.get(salaryAcctEmployeePO.getSalaryAcctRecordId());
// String salarySobName = salarySobNameMap.getOrDefault(salaryAcctRecordPO.getSalarySobId(), "");
// valueMap.put("salarySobName", "第" + salaryAcctRecordPO.getAcctTimes() + "次（" + salarySobName + "）");
// data.add(valueMap);
// });
// weaTable.setData(data);
// weaTable.setDisplayData(data);
// return weaTable;
// }
核算v2
2022-04-08 19:08:59 +08:00
/**
* 薪资核算结果临时存储转成薪资核算结果po
*
* @param temps
* @return
*/
public static List<SalaryAcctResultPO> convert2ResultPO(Collection<SalaryAcctResultTempPO> temps) {
if (CollectionUtils.isEmpty(temps)) {
return Collections.emptyList();
}
return temps.stream().map(e -> {
SalaryAcctResultPO salaryAcctResult = new SalaryAcctResultPO();
BeanUtils.copyProperties(e, salaryAcctResult);
return salaryAcctResult;
}).collect(Collectors.toList());
}
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
2022-07-11 17:31:33 +08:00
核算v2
2022-04-08 19:08:59 +08:00
}