From b4050e4ee850de70bcadbae3556671810023ff80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Sun, 29 Sep 2024 16:58:41 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BF=AB=E7=85=A7?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SalaryStatisticsReportServiceImpl.java | 184 +++++++++++-------
.../SalaryStatisticsReportWrapper.java | 44 ++---
.../impl/SalaryAcctEmployeeServiceImpl.java | 109 ++++-------
.../sys/constant/SalarySysConstant.java | 11 ++
4 files changed, 187 insertions(+), 161 deletions(-)
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index 42a65d485..ab16db7cc 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -54,6 +54,8 @@ import weaver.wechat.util.Utils;
import java.util.*;
import java.util.stream.Collectors;
+import static com.engine.salary.sys.constant.SalarySysConstant.REPORT_ORGANIZATIN_TYPE;
+
/**
* 薪酬统计报表
* Copyright: Copyright (c) 2022
@@ -71,6 +73,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
public static final String LAST_INFO = "lastInfoList";
public static final String SAME_INFO = "sameInfoList";
+ private boolean isRealOrg = "1".equals(getSalaryCacheService(user).get(REPORT_ORGANIZATIN_TYPE));
private SalaryStatisticsReportMapper getSalaryStatisticsReportMapper() {
return MapperProxyFactory.getProxy(SalaryStatisticsReportMapper.class);
@@ -197,16 +200,16 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
this.getSalaryStatisticsReportMapper().updateIgnoreNull(poNew);
// 记录日志
- LoggerContext loggerContext = new LoggerContext<>();
- loggerContext.setUser(user);
- loggerContext.setTargetId(String.valueOf(poNew.getId()));
- loggerContext.setTargetName(poNew.getReportName());
- loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
- loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "更新报表"));
- loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "更新报表"));
- loggerContext.setOldValues(po);
- loggerContext.setNewValues(poNew);
- SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
+ LoggerContext loggerContext = new LoggerContext<>();
+ loggerContext.setUser(user);
+ loggerContext.setTargetId(String.valueOf(poNew.getId()));
+ loggerContext.setTargetName(poNew.getReportName());
+ loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
+ loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更新报表"));
+ loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新报表"));
+ loggerContext.setOldValues(po);
+ loggerContext.setNewValues(poNew);
+ SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
} else {
List list = listByName(saveParam.getReportName());
if (CollectionUtils.isNotEmpty(list)) {
@@ -217,15 +220,15 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
getSalaryStatisticsReportMapper().insertIgnoreNull(poNew);
// 记录日志
- LoggerContext loggerContext = new LoggerContext<>();
- loggerContext.setUser(user);
- loggerContext.setTargetId(String.valueOf(poNew.getId()));
- loggerContext.setTargetName(poNew.getReportName());
- loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
- loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增报表"));
- loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增报表"));
- loggerContext.setNewValues(poNew);
- SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
+ LoggerContext loggerContext = new LoggerContext<>();
+ loggerContext.setUser(user);
+ loggerContext.setTargetId(String.valueOf(poNew.getId()));
+ loggerContext.setTargetName(poNew.getReportName());
+ loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
+ loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增报表"));
+ loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增报表"));
+ loggerContext.setNewValues(poNew);
+ SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
}
return StringUtils.EMPTY;
}
@@ -305,16 +308,16 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
getSalaryStatisticsItemService(user).saveOrUpdateBatch(salaryStatisticsItemList);
//记录日志
- LoggerContext loggerContext = new LoggerContext<>();
- loggerContext.setUser(user);
- loggerContext.setTargetId(String.valueOf(po.getId()));
- loggerContext.setTargetName(po.getReportName());
- loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
- loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "更新报表"));
- loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新报表"));
- loggerContext.setOldValues(oldPO);
- loggerContext.setNewValues(po);
- SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
+ LoggerContext loggerContext = new LoggerContext<>();
+ loggerContext.setUser(user);
+ loggerContext.setTargetId(String.valueOf(po.getId()));
+ loggerContext.setTargetName(po.getReportName());
+ loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
+ loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更新报表"));
+ loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新报表"));
+ loggerContext.setOldValues(oldPO);
+ loggerContext.setNewValues(po);
+ SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
return StringUtils.EMPTY;
}
@@ -333,17 +336,17 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
getSalaryStatisticsReportMapper().deleteByIds(deleteIds);
//删除薪资项
getSalaryStatisticsItemService(user).deleteByReportIds(deleteIds);
- list.forEach(e -> {
- // 记录日志
- LoggerContext loggerContext = new LoggerContext<>();
- loggerContext.setUser(user);
- loggerContext.setTargetId(String.valueOf(e.getId()));
- loggerContext.setTargetName(e.getReportName());
- loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
- loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "删除报表"));
- loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "删除报表") + e.getReportName());
- SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
- });
+ list.forEach(e -> {
+ // 记录日志
+ LoggerContext loggerContext = new LoggerContext<>();
+ loggerContext.setUser(user);
+ loggerContext.setTargetId(String.valueOf(e.getId()));
+ loggerContext.setTargetName(e.getReportName());
+ loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
+ loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除报表"));
+ loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除报表") + e.getReportName());
+ SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
+ });
}
Map resultMap = new HashMap<>(2);
@@ -396,8 +399,8 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
loggerContext.setTargetId(String.valueOf(po.getId()));
loggerContext.setTargetName(po.getReportName());
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
- loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增报表"));
- loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增报表"));
+ loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增报表"));
+ loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增报表"));
loggerContext.setNewValues(po);
SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext);
}
@@ -479,7 +482,15 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listBySalaryStatisticsReportParam(queryParam);
// 设置dimensionValue为维度值
- SalaryStatisticsReportDataDTO salaryStatisticsReportData = SalaryStatisticsReportDataDTO.builder().list(salaryAcctEmployeeList).lastList(Collections.emptyList()).sameList(Collections.emptyList()).salaryStatisticsItemList(salaryStatisticsItemPOS).employeeId((long) user.getUID()).tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY).dimensionValue(param.getDimensionValue()).build();
+ SalaryStatisticsReportDataDTO salaryStatisticsReportData = SalaryStatisticsReportDataDTO.builder()
+ .list(salaryAcctEmployeeList)
+ .lastList(Collections.emptyList())
+ .sameList(Collections.emptyList())
+ .salaryStatisticsItemList(salaryStatisticsItemPOS)
+ .employeeId((long) user.getUID())
+ .dimensionValue(param.getDimensionValue())
+ .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+ .build();
Map> resultMap = new HashMap<>();
List salaryAcctEmployeeIds = salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getId).collect(Collectors.toList());
@@ -848,44 +859,78 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
Map lastEmpIdDepartIdMap = new HashMap<>();
Map sameEmpIdDepartIdMap = new HashMap<>();
Map departIdNameMap = new HashMap<>();
- simpleEmployeeList.forEach(employee -> {
- if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
- departIdNameMap.put(employee.getDepartmentId(), employee.getDepartmentName());
- departIds.add(employee.getDepartmentId());
- empIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
- }
- });
- lastSimpleEmployeeList.forEach(employee -> {
- if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
- lastEmpIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
- }
- });
- sameSimpleEmployeeList.forEach(employee -> {
- if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
- sameEmpIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
- }
- });
+ if (isRealOrg) {
+ simpleEmployeeList.forEach(employee -> {
+ if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
+ departIdNameMap.put(employee.getDepartmentId(), employee.getDepartmentName());
+ departIds.add(employee.getDepartmentId());
+ empIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
+ }
+ });
+ lastSimpleEmployeeList.forEach(employee -> {
+ if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
+ lastEmpIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
+ }
+ });
+ sameSimpleEmployeeList.forEach(employee -> {
+ if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
+ sameEmpIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
+ }
+ });
+ } else {
+ data.getList().forEach(employee -> {
+ if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
+ departIdNameMap.put(employee.getDepartmentId(), employee.getDepartmentName());
+ departIds.add(employee.getDepartmentId());
+ empIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
+ }
+ });
+ data.getLastList().forEach(employee -> {
+ if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
+ lastEmpIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
+ }
+ });
+ data.getSameList().forEach(employee -> {
+ if (employee.getDepartmentName() != null && employee.getDepartmentId() != null) {
+ sameEmpIdDepartIdMap.put(employee.getEmployeeId(), employee.getDepartmentId());
+ }
+ });
+ }
String dimensionValue = data.getDimensionValue();
departIds.forEach(departId -> {
if (dimensionValue == null) {
- List departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
- List lastDepartEmployeePOS = data.getLastList().stream().filter(po -> Objects.equals(lastEmpIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
- List sameDepartEmployeePOS = data.getSameList().stream().filter(po -> Objects.equals(sameEmpIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ List departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(po.getDepartmentId(), departId)).collect(Collectors.toList());
+ List lastDepartEmployeePOS = data.getLastList().stream().filter(po -> Objects.equals(po.getDepartmentId(), departId)).collect(Collectors.toList());
+ List sameDepartEmployeePOS = data.getSameList().stream().filter(po -> Objects.equals(po.getDepartmentId(), departId)).collect(Collectors.toList());
+ if (isRealOrg) {
+ departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ lastDepartEmployeePOS = data.getLastList().stream().filter(po -> Objects.equals(lastEmpIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ sameDepartEmployeePOS = data.getSameList().stream().filter(po -> Objects.equals(sameEmpIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ }
Map temp = new HashMap<>();
temp.put(DM, departIdNameMap.get(departId));
temp.putAll(SalaryStatisticsReportBO.calculateItem(departEmployeePOS, lastDepartEmployeePOS, sameDepartEmployeePOS, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()));
records.add(temp);
} else if (StringUtils.equals(dimensionValue, departIdNameMap.get(departId))) {
- List departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ List departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(po.getDepartmentId(), departId)).collect(Collectors.toList());
+ if (isRealOrg) {
+ data.getList().stream().filter(po -> Objects.equals(empIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ }
data.setListByDimensionValue(departEmployeePOS);
}
});
if (dimensionValue == null) {
- List noGroupingList = data.getList().stream().filter(po -> empIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
- List lastNoGroupingList = data.getLastList().stream().filter(po -> lastEmpIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
- List sameNoGroupingList = data.getSameList().stream().filter(po -> lastEmpIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ List noGroupingList = data.getList().stream().filter(po -> po.getDepartmentId() == null).collect(Collectors.toList());
+ List lastNoGroupingList = data.getLastList().stream().filter(po -> po.getDepartmentId() == null).collect(Collectors.toList());
+ List sameNoGroupingList = data.getSameList().stream().filter(po -> po.getDepartmentId() == null).collect(Collectors.toList());
+ if (isRealOrg) {
+ noGroupingList = data.getList().stream().filter(po -> empIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ lastNoGroupingList = data.getLastList().stream().filter(po -> lastEmpIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ sameNoGroupingList = data.getSameList().stream().filter(po -> lastEmpIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+
+ }
if (CollectionUtils.isNotEmpty(noGroupingList)) {
Map noGrouping = new HashMap<>();
noGrouping.put(DM, SalaryI18nUtil.getI18nLabel(153462, "无分组"));
@@ -893,7 +938,10 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
records.add(noGrouping);
}
} else if (StringUtils.equals(dimensionValue, "无分组")) {
- List noGroupingList = data.getList().stream().filter(po -> empIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ List noGroupingList = data.getList().stream().filter(po -> po.getDepartmentId() == null).collect(Collectors.toList());
+ if(isRealOrg){
+ noGroupingList = data.getList().stream().filter(po -> empIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ }
data.setListByDimensionValue(noGroupingList);
}
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 22fb6261f..7556b7bf8 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -332,28 +332,28 @@ public class SalaryStatisticsReportWrapper extends Service {
if (empDimensionOptional.isPresent()) {
empDimensionId = empDimensionOptional.get();
}
- if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
- //报表中缓存的条件
- salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
- if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
- Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
- if (param.getDimensionId().equals(empDimensionId)) {
- // 人员维度需要分页
- Map finalResultMap = new HashMap<>();
- PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
- PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
- finalPageInfo.setTotal(pageInfo.getList().size());
- finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
- finalResultMap.put("pageInfo", finalPageInfo);
- finalResultMap.put("columns", result.get("columns"));
- finalResultMap.put("countResult", result.get("countResult"));
- finalResultMap.put("reportId", id);
- return finalResultMap;
- }
-
- return result;
- }
- }
+// if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
+// //报表中缓存的条件
+// salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
+// if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
+// Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
+// if (param.getDimensionId().equals(empDimensionId)) {
+// // 人员维度需要分页
+// Map finalResultMap = new HashMap<>();
+// PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
+// PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
+// finalPageInfo.setTotal(pageInfo.getList().size());
+// finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
+// finalResultMap.put("pageInfo", finalPageInfo);
+// finalResultMap.put("columns", result.get("columns"));
+// finalResultMap.put("countResult", result.get("countResult"));
+// finalResultMap.put("reportId", id);
+// return finalResultMap;
+// }
+//
+// return result;
+// }
+// }
// 列表data
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index a36f2dd57..0dce7dbda 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -47,6 +47,8 @@ import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
+import static com.engine.salary.sys.constant.SalarySysConstant.REPORT_ORGANIZATIN_TYPE;
+
/**
* 薪资核算人员
* Copyright: Copyright (c) 2022
@@ -102,6 +104,11 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
}
+ private SalaryCacheService getSalaryCacheService(User user) {
+ return ServiceUtil.getService(SalaryCacheServiceImpl.class, user);
+ }
+
+ private boolean isRealOrg = "1".equals(getSalaryCacheService(user).get(REPORT_ORGANIZATIN_TYPE));
@Override
public List countBySalaryAcctRecordId(Collection salaryAcctRecordIds) {
@@ -656,11 +663,6 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
lambdaQueryChainWrapper.setSalaryMonths(yearMonths);
}
- // 收入所得项目
-// if (CollectionUtils.isNotEmpty(param.getIncomeCategory())) {
-// lambdaQueryChainWrapper.in(SalaryAcctEmployeePO::getIncomeCategory, param.getIncomeCategory().stream().map(Object::toString).collect(Collectors.toList()));
-// }
-
//排除未归档数据
List salaryAcctRecordPOS = getSalaryAcctRecordService(user).listAll();
List salaryAcctRecordIds = salaryAcctRecordPOS.stream()
@@ -690,70 +692,47 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
// 获取分部信息
List subCompanyIds = param.getSubCompany();
if (CollectionUtils.isNotEmpty(subCompanyIds)) {
-// SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
-// List allSubcompanyIds = new ArrayList<>();
-// for (Long subCompanyId : subCompanyIds) {
-// String organizationIds = Util.null2String(subCompanyId);
-// String allChildSubcompanyId = subCompanyComInfo.getAllChildSubcompanyId(subCompanyId.toString(), organizationIds);
-// allSubcompanyIds.addAll(Arrays.asList(allChildSubcompanyId.split(",")));
-// }
- employeeList = employeeList.stream().filter(emp -> subCompanyIds.contains(emp.getSubcompanyid())).collect(Collectors.toList());
+ if (isRealOrg) {
+ employeeList = employeeList.stream().filter(emp -> subCompanyIds.contains(emp.getSubcompanyid())).collect(Collectors.toList());
+ } else {
+ list.stream().filter(emp -> subCompanyIds.contains(emp.getSubcompanyId())).collect(Collectors.toList());
+ }
}
// 部门过滤
List depart = param.getDepart();
if (CollectionUtils.isNotEmpty(depart)) {
-// List allDepartIds = new ArrayList<>();
-// for (Long subDepartId : depart) {
-// String ids = Util.null2String(subDepartId);
-// try {
-// String allDepartId = DepartmentComInfo.getAllChildDepartId(subDepartId.toString(), ids);
-// allDepartIds.addAll(Arrays.asList(allDepartId.toString().split(",")));
-// } catch (Exception e) {
-// log.error("获取子部门失败", e);
-// }
-// }
- employeeList = employeeList.stream().filter(emp -> depart.contains(emp.getDepartmentId())).collect(Collectors.toList());
+ if (isRealOrg) {
+ employeeList = employeeList.stream().filter(emp -> depart.contains(emp.getDepartmentId())).collect(Collectors.toList());
+ } else {
+ list = list.stream().filter(emp -> depart.contains(emp.getDepartmentId())).collect(Collectors.toList());
+ }
}
- // 职级过滤
-// if (CollectionUtils.isNotEmpty(param.getGrade())) {
-// Set employeeIdsByGradeFilter = new HashSet<>();
-// simpleEmployeeList.forEach(simpleEmployee -> {
-// if (simpleEmployee.getGrade() != null && param.getGrade().contains(simpleEmployee.getGrade().getId())) {
-// employeeIdsByGradeFilter.add(simpleEmployee.getEmployeeId());
-// }
-// });
-// if (CollectionUtils.isEmpty(employeeIdsByGradeFilter)) {
-// return Lists.newArrayList();
-// }
-// list = list.stream().filter(po -> employeeIdsByGradeFilter.contains(po.getEmployeeId())).collect(Collectors.toList());
-// }
// 岗位过滤
List position = param.getPosition();
if (CollectionUtils.isNotEmpty(position)) {
- // Set employeeIdsByPostionFilter = new HashSet<>();
- // simpleEmployeeList.forEach(simpleEmployee -> {
- // if (simpleEmployee.getPosition() != null && param.getPosition().contains(simpleEmployee.getPosition().getId())) {
- // employeeIdsByPostionFilter.add(simpleEmployee.getEmployeeId());
- // }
- // });
- // if (CollectionUtils.isEmpty(employeeIdsByPostionFilter)) {
- // return Lists.newArrayList();
- // }
- employeeList = employeeList.stream().filter(emp -> position.contains(emp.getJobtitleId())).collect(Collectors.toList());
+ if (isRealOrg) {
+ employeeList = employeeList.stream().filter(emp -> position.contains(emp.getJobtitleId())).collect(Collectors.toList());
+ } else {
+ list = list.stream().filter(emp -> position.contains(emp.getJobtitleId())).collect(Collectors.toList());
+ }
}
// 人事状态过滤
if (CollectionUtils.isNotEmpty(param.getStatus())) {
- Set employeeIdsByStatus = new HashSet<>();
- employeeList.forEach(simpleEmployee -> {
- if (simpleEmployee.getStatus() != null && param.getStatus().contains(simpleEmployee.getStatus())) {
- employeeIdsByStatus.add(simpleEmployee.getEmployeeId());
+ if (isRealOrg) {
+ Set employeeIdsByStatus = new HashSet<>();
+ employeeList.forEach(simpleEmployee -> {
+ if (simpleEmployee.getStatus() != null && param.getStatus().contains(simpleEmployee.getStatus())) {
+ employeeIdsByStatus.add(simpleEmployee.getEmployeeId());
+ }
+ });
+ if (CollectionUtils.isEmpty(employeeIdsByStatus)) {
+ return Lists.newArrayList();
}
- });
- if (CollectionUtils.isEmpty(employeeIdsByStatus)) {
- return Lists.newArrayList();
+ list = list.stream().filter(po -> employeeIdsByStatus.contains(po.getEmployeeId())).collect(Collectors.toList());
+ } else {
+ list = list.stream().filter(po -> po.getStatus() != null && param.getStatus().contains(po.getStatus())).collect(Collectors.toList());
}
- list = list.stream().filter(po -> employeeIdsByStatus.contains(po.getEmployeeId())).collect(Collectors.toList());
}
// 入职日期
if (CollectionUtils.isNotEmpty(param.getHiredate())) {
@@ -769,27 +748,15 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
}
list = list.stream().filter(po -> employeeIdsByHiredate.contains(po.getEmployeeId())).collect(Collectors.toList());
}
-// // 离职日期 todo
-// if (CollectionUtils.isNotEmpty(param.getLeavedate())) {
-// Set employeeIdsByLeavedate = new HashSet<>();
-// simpleEmployeeList.forEach(simpleEmployee -> {
-//
-// if (simpleEmployee.get() != null && ) {
-// employeeIdsByLeavedate.add(simpleEmployee.getEmployeeId());
-// }
-// });
-// if (CollectionUtils.isEmpty(employeeIdsByLeavedate)) {
-// return Lists.newArrayList();
-// }
-// list = list.stream().filter(po -> employeeIdsByLeavedate.contains(po.getEmployeeId())).collect(Collectors.toList());
-// }
// 人员
if (CollectionUtils.isNotEmpty(param.getEmployee())) {
list = list.stream().filter(po -> param.getEmployee().contains(po.getEmployeeId())).collect(Collectors.toList());
}
- Set empIds = SalaryEntityUtil.properties(employeeList, DataCollectionEmployee::getEmployeeId);
- list = list.stream().filter(po -> empIds.contains(po.getEmployeeId())).collect(Collectors.toList());
+ if(isRealOrg){
+ Set empIds = SalaryEntityUtil.properties(employeeList, DataCollectionEmployee::getEmployeeId);
+ list = list.stream().filter(po -> empIds.contains(po.getEmployeeId())).collect(Collectors.toList());
+ }
return list;
}
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index ff055b89e..443cd4fd5 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -145,4 +145,15 @@ public class SalarySysConstant {
* 我的薪资福利工资单个税扣缴义务人显示状态
*/
public static final String TAX_AGENT_SHOW_STATUS = "taxAgentShowStatus";
+
+
+ /**
+ * 报表是否开启缓存，0：关闭 1：开启
+ */
+ public static final String REPORT_CACHE = "REPORT_CACHE";
+
+ /**
+ * 报表组织类型，null/0 ：核算快照信息 1：实时组织信息
+ */
+ public static final String REPORT_ORGANIZATIN_TYPE = "REPORT_ORGANIZATIN_TYPE";
}
From 13f085420824942fe466020df94731484c227a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Sun, 29 Sep 2024 17:02:59 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SalaryStatisticsReportWrapper.java | 44 +++++++++----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 7556b7bf8..22fb6261f 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -332,28 +332,28 @@ public class SalaryStatisticsReportWrapper extends Service {
if (empDimensionOptional.isPresent()) {
empDimensionId = empDimensionOptional.get();
}
-// if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
-// //报表中缓存的条件
-// salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
-// if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
-// Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
-// if (param.getDimensionId().equals(empDimensionId)) {
-// // 人员维度需要分页
-// Map finalResultMap = new HashMap<>();
-// PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
-// PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
-// finalPageInfo.setTotal(pageInfo.getList().size());
-// finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
-// finalResultMap.put("pageInfo", finalPageInfo);
-// finalResultMap.put("columns", result.get("columns"));
-// finalResultMap.put("countResult", result.get("countResult"));
-// finalResultMap.put("reportId", id);
-// return finalResultMap;
-// }
-//
-// return result;
-// }
-// }
+ if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
+ //报表中缓存的条件
+ salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
+ if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
+ Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
+ if (param.getDimensionId().equals(empDimensionId)) {
+ // 人员维度需要分页
+ Map finalResultMap = new HashMap<>();
+ PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
+ PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
+ finalPageInfo.setTotal(pageInfo.getList().size());
+ finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
+ finalResultMap.put("pageInfo", finalPageInfo);
+ finalResultMap.put("columns", result.get("columns"));
+ finalResultMap.put("countResult", result.get("countResult"));
+ finalResultMap.put("reportId", id);
+ return finalResultMap;
+ }
+
+ return result;
+ }
+ }
// 列表data
From 8c0bad80232807239452bf6d4109228e5d5adc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 30 Sep 2024 10:37:27 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SalaryStatisticsReportServiceImpl.java | 77 ++++++++++++++-----
1 file changed, 58 insertions(+), 19 deletions(-)
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index ab16db7cc..ecceda7a9 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -796,38 +796,74 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
Map subComIdNameMap = new HashMap<>();
Map lastEmpIdSubComMap = new HashMap<>();
Map sameEmpIdSubComMap = new HashMap<>();
- comInfoMap.forEach((k, v) -> {
- subComIdNameMap.put(v.getSubcompanyid(), v.getSubcompanyName());
- empIdSubComMap.put(k, v.getSubcompanyid());
- subComIds.add(v.getSubcompanyid());
- });
- lastComInfoMap.forEach((k, v) -> {
- lastEmpIdSubComMap.put(k, v.getSubcompanyid());
- });
- sameComInfoMap.forEach((k, v) -> {
- sameEmpIdSubComMap.put(k, v.getSubcompanyid());
- });
+
+ if (isRealOrg) {
+ comInfoMap.forEach((k, v) -> {
+ subComIdNameMap.put(v.getSubcompanyid(), v.getSubcompanyName());
+ empIdSubComMap.put(k, v.getSubcompanyid());
+ subComIds.add(v.getSubcompanyid());
+ });
+ lastComInfoMap.forEach((k, v) -> {
+ lastEmpIdSubComMap.put(k, v.getSubcompanyid());
+ });
+ sameComInfoMap.forEach((k, v) -> {
+ sameEmpIdSubComMap.put(k, v.getSubcompanyid());
+ });
+ } else {
+ data.getList().forEach(employee -> {
+ if (employee.getSubcompanyId() != null && employee.getSubcompanyId() != null) {
+ subComIdNameMap.put(employee.getSubcompanyId(), employee.getSubcompanyName());
+ subComIds.add(employee.getDepartmentId());
+ empIdSubComMap.put(employee.getEmployeeId(), employee.getSubcompanyId());
+ }
+ });
+ data.getLastList().forEach(employee -> {
+ if (employee.getSubcompanyId() != null && employee.getSubcompanyId() != null) {
+ lastEmpIdSubComMap.put(employee.getEmployeeId(), employee.getSubcompanyId());
+ }
+ });
+ data.getSameList().forEach(employee -> {
+ if (employee.getSubcompanyId() != null && employee.getSubcompanyId() != null) {
+ sameEmpIdSubComMap.put(employee.getEmployeeId(), employee.getSubcompanyId());
+ }
+ });
+ }
+
String dimensionValue = data.getDimensionValue();
subComIds.forEach(subComId -> {
if (dimensionValue == null) {
- List subComEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
- List lastSubComEmployeePOS = data.getLastList().stream().filter(po -> Objects.equals(lastEmpIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
- List sameSubComEmployeePOS = data.getSameList().stream().filter(po -> Objects.equals(sameEmpIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
+ List subComEmployeePOS = data.getList().stream().filter(po -> Objects.equals(po.getSubcompanyId(), subComId)).collect(Collectors.toList());
+ List lastSubComEmployeePOS = data.getLastList().stream().filter(po -> Objects.equals(po.getSubcompanyId(), subComId)).collect(Collectors.toList());
+ List sameSubComEmployeePOS = data.getSameList().stream().filter(po -> Objects.equals(po.getSubcompanyId(), subComId)).collect(Collectors.toList());
+ if (isRealOrg) {
+ subComEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
+ lastSubComEmployeePOS = data.getLastList().stream().filter(po -> Objects.equals(lastEmpIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
+ sameSubComEmployeePOS = data.getSameList().stream().filter(po -> Objects.equals(sameEmpIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
+ }
Map temp = new HashMap<>();
temp.put(DM, subComIdNameMap.get(subComId));
temp.putAll(SalaryStatisticsReportBO.calculateItem(subComEmployeePOS, lastSubComEmployeePOS, sameSubComEmployeePOS, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()));
records.add(temp);
} else if (StringUtils.equals(dimensionValue, subComIdNameMap.get(subComId))) {
- List subComEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
+ List subComEmployeePOS = data.getList().stream().filter(po -> Objects.equals(po.getSubcompanyId(), subComId)).collect(Collectors.toList());
+ if (isRealOrg) {
+ subComEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdSubComMap.get(po.getEmployeeId()), subComId)).collect(Collectors.toList());
+ }
data.setListByDimensionValue(subComEmployeePOS);
}
});
if (dimensionValue == null) {
- List noGroupingList = data.getList().stream().filter(po -> empIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
- List lastNoGroupingList = data.getLastList().stream().filter(po -> lastEmpIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
- List sameNoGroupingList = data.getSameList().stream().filter(po -> sameEmpIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ List noGroupingList = data.getList().stream().filter(po -> po.getSubcompanyId() == null).collect(Collectors.toList());
+ List lastNoGroupingList = data.getLastList().stream().filter(po -> po.getSubcompanyId() == null).collect(Collectors.toList());
+ List sameNoGroupingList = data.getSameList().stream().filter(po -> po.getSubcompanyId() == null).collect(Collectors.toList());
+ if (isRealOrg) {
+ noGroupingList = data.getList().stream().filter(po -> empIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ lastNoGroupingList = data.getLastList().stream().filter(po -> lastEmpIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ sameNoGroupingList = data.getSameList().stream().filter(po -> sameEmpIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ }
+
if (CollectionUtils.isNotEmpty(noGroupingList)) {
Map noGrouping = new HashMap<>();
noGrouping.put(DM, SalaryI18nUtil.getI18nLabel(153462, "无分组"));
@@ -836,6 +872,9 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
}
} else if (StringUtils.equals(dimensionValue, "无分组")) {
List noGroupingList = data.getList().stream().filter(po -> empIdSubComMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
+ if (isRealOrg) {
+ noGroupingList = data.getList().stream().filter(po -> po.getSubcompanyId() == null).collect(Collectors.toList());
+ }
data.setListByDimensionValue(noGroupingList);
}
@@ -939,7 +978,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
}
} else if (StringUtils.equals(dimensionValue, "无分组")) {
List noGroupingList = data.getList().stream().filter(po -> po.getDepartmentId() == null).collect(Collectors.toList());
- if(isRealOrg){
+ if (isRealOrg) {
noGroupingList = data.getList().stream().filter(po -> empIdDepartIdMap.get(po.getEmployeeId()) == null).collect(Collectors.toList());
}
data.setListByDimensionValue(noGroupingList);
From edb07052b5a1151a640148fdf78bf1b7a222b8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 8 Oct 2024 14:36:18 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/com/engine/salary/sys/constant/SalarySysConstant.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index 443cd4fd5..6f35124c3 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -153,7 +153,7 @@ public class SalarySysConstant {
public static final String REPORT_CACHE = "REPORT_CACHE";
/**
- * 报表组织类型，null/0 ：核算快照信息 1：实时组织信息
+ * 报表组织类型，null/0 ：核算时组织信息 1：实时组织信息
*/
public static final String REPORT_ORGANIZATIN_TYPE = "REPORT_ORGANIZATIN_TYPE";
}
From ff5419f2bb1a1431cfd97a8ad634ebc9f8d00da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 8 Oct 2024 15:45:12 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SalaryStatisticsEmployeeServiceImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 2e7663392..3ec96c6dc 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -315,7 +315,8 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
.collect(Collectors.toSet());
// 查询薪资核算人员
- List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByTaxAgentAndSalaryMonth(taxAgentIds, salaryMonths);
+ SalaryAcctEmployeeQueryParam salaryAcctEmployeeQueryParam = SalaryAcctEmployeeQueryParam.builder().salaryMonths(salaryMonths).taxAgentIds(taxAgentIds).build();
+ List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam);
if (CollectionUtils.isNotEmpty(queryParam.getSubCompanyIds()) || CollectionUtils.isNotEmpty(queryParam.getDepartmentIds()) || StringUtils.isNotBlank(queryParam.getKeyword())) {
// 根据分部、部门筛选
List employeeList = getSalaryEmployeeService(user).listBySubCompanyOrDepartment(queryParam.getSubCompanyIds(), queryParam.getDepartmentIds());
@@ -336,8 +337,7 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
if (CollectionUtils.isNotEmpty(queryParam.getIds())) {
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(emp -> queryParam.getIds().contains(emp.getId())).collect(Collectors.toList());
}
- salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getSalaryMonth)).collect(Collectors.toList());
- Collections.reverse(salaryAcctEmployeeList);
+ salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getSalaryMonth).reversed()).collect(Collectors.toList());
PageInfo SalaryAcctEmployeePageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), salaryAcctEmployeeList);
if (queryParam.isExport()) {
SalaryAcctEmployeePageInfo.setList(salaryAcctEmployeeList);
From 61dee5d3a122d1f3ddb1d3b2d85b38a823de81d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 8 Oct 2024 15:48:33 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SalaryStatisticsEmployeeServiceImpl.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 3ec96c6dc..57a8d103d 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -288,9 +288,6 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
@Override
public PageInfo listSalaryAcctEmp(SalaryStatisticsEmployeeSalaryQueryParam queryParam) {
- List list = Collections.emptyList();
- PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, SalaryStatisticsEmployeeListDTO.class);
-
// 1.分权处理, 首先获取个税扣缴义务人参数
Collection taxAgentViews = getTaxAgentService(user).listAllTaxAgents((long) user.getUID());
List taxAgentIds = Objects.isNull(taxAgentViews) ? Lists.newArrayList() : taxAgentViews.stream().map(TaxAgentPO::getId).collect(Collectors.toList());
From a40188659fe2af6f077d721f840be319deb76862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 9 Oct 2024 13:21:28 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SalaryStatisticsReportServiceImpl.java | 9 +++-
.../SalaryStatisticsReportWrapper.java | 44 +++++++++----------
.../sys/service/SalarySysConfService.java | 2 +
.../impl/SalarySysConfServiceImpl.java | 6 +++
4 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index ecceda7a9..8886cfa6f 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -33,6 +33,8 @@ import com.engine.salary.report.service.SalaryStatisticsReportService;
import com.engine.salary.report.util.ReportTimeUtil;
import com.engine.salary.service.*;
import com.engine.salary.service.impl.*;
+import com.engine.salary.sys.service.SalarySysConfService;
+import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
import com.engine.salary.util.*;
import com.engine.salary.util.db.IdGenerator;
import com.engine.salary.util.db.MapperProxyFactory;
@@ -73,7 +75,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
public static final String LAST_INFO = "lastInfoList";
public static final String SAME_INFO = "sameInfoList";
- private boolean isRealOrg = "1".equals(getSalaryCacheService(user).get(REPORT_ORGANIZATIN_TYPE));
+ private final boolean isRealOrg = "1".equals(getSalarySysConfService(user).getValueByCode(REPORT_ORGANIZATIN_TYPE));
private SalaryStatisticsReportMapper getSalaryStatisticsReportMapper() {
return MapperProxyFactory.getProxy(SalaryStatisticsReportMapper.class);
@@ -115,6 +117,9 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
return ServiceUtil.getService(SalaryCacheServiceImpl.class, user);
}
+ private SalarySysConfService getSalarySysConfService(User user) {
+ return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
+ }
// private ExtEmployeeService extEmployeeService;
//
// private HrmCommonEmployeeService hrmCommonEmployeeService;
@@ -954,7 +959,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
} else if (StringUtils.equals(dimensionValue, departIdNameMap.get(departId))) {
List departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(po.getDepartmentId(), departId)).collect(Collectors.toList());
if (isRealOrg) {
- data.getList().stream().filter(po -> Objects.equals(empIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
+ departEmployeePOS = data.getList().stream().filter(po -> Objects.equals(empIdDepartIdMap.get(po.getEmployeeId()), departId)).collect(Collectors.toList());
}
data.setListByDimensionValue(departEmployeePOS);
}
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 22fb6261f..7556b7bf8 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -332,28 +332,28 @@ public class SalaryStatisticsReportWrapper extends Service {
if (empDimensionOptional.isPresent()) {
empDimensionId = empDimensionOptional.get();
}
- if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
- //报表中缓存的条件
- salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
- if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
- Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
- if (param.getDimensionId().equals(empDimensionId)) {
- // 人员维度需要分页
- Map finalResultMap = new HashMap<>();
- PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
- PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
- finalPageInfo.setTotal(pageInfo.getList().size());
- finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
- finalResultMap.put("pageInfo", finalPageInfo);
- finalResultMap.put("columns", result.get("columns"));
- finalResultMap.put("countResult", result.get("countResult"));
- finalResultMap.put("reportId", id);
- return finalResultMap;
- }
-
- return result;
- }
- }
+// if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
+// //报表中缓存的条件
+// salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
+// if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
+// Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
+// if (param.getDimensionId().equals(empDimensionId)) {
+// // 人员维度需要分页
+// Map finalResultMap = new HashMap<>();
+// PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
+// PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
+// finalPageInfo.setTotal(pageInfo.getList().size());
+// finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
+// finalResultMap.put("pageInfo", finalPageInfo);
+// finalResultMap.put("columns", result.get("columns"));
+// finalResultMap.put("countResult", result.get("countResult"));
+// finalResultMap.put("reportId", id);
+// return finalResultMap;
+// }
+//
+// return result;
+// }
+// }
// 列表data
diff --git a/src/com/engine/salary/sys/service/SalarySysConfService.java b/src/com/engine/salary/sys/service/SalarySysConfService.java
index 91eab5317..6b78ceca2 100644
--- a/src/com/engine/salary/sys/service/SalarySysConfService.java
+++ b/src/com/engine/salary/sys/service/SalarySysConfService.java
@@ -40,6 +40,8 @@ public interface SalarySysConfService {
SalarySysConfPO getOneByCode(String code);
+ String getValueByCode(String code);
+
List listSome(SalarySysConfPO build);
void save(SalarySysConfPO salarySysConfPO);
diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
index 956e6f7cd..64771e07d 100644
--- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
+++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
@@ -216,6 +216,12 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
return getSalarySysConfMapper().getOneByCode(code);
}
+ @Override
+ public String getValueByCode(String code) {
+ SalarySysConfPO confPO = getSalarySysConfMapper().getOneByCode(code);
+ return confPO == null ? "" : confPO.getConfValue();
+ }
+
@Override
public List listSome(SalarySysConfPO po) {
return getSalarySysConfMapper().listSome(po);
From 3a128a4c5be86862673e1dff9ecbc0b7afe7ec1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 9 Oct 2024 14:59:33 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SalaryStatisticsReportWrapper.java | 44 +++++++++----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 7556b7bf8..22fb6261f 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -332,28 +332,28 @@ public class SalaryStatisticsReportWrapper extends Service {
if (empDimensionOptional.isPresent()) {
empDimensionId = empDimensionOptional.get();
}
-// if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
-// //报表中缓存的条件
-// salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
-// if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
-// Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
-// if (param.getDimensionId().equals(empDimensionId)) {
-// // 人员维度需要分页
-// Map finalResultMap = new HashMap<>();
-// PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
-// PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
-// finalPageInfo.setTotal(pageInfo.getList().size());
-// finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
-// finalResultMap.put("pageInfo", finalPageInfo);
-// finalResultMap.put("columns", result.get("columns"));
-// finalResultMap.put("countResult", result.get("countResult"));
-// finalResultMap.put("reportId", id);
-// return finalResultMap;
-// }
-//
-// return result;
-// }
-// }
+ if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
+ //报表中缓存的条件
+ salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
+ if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
+ Map result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
+ if (param.getDimensionId().equals(empDimensionId)) {
+ // 人员维度需要分页
+ Map finalResultMap = new HashMap<>();
+ PageInfo> pageInfo = (PageInfo>) result.get("pageInfo");
+ PageInfo> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
+ finalPageInfo.setTotal(pageInfo.getList().size());
+ finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
+ finalResultMap.put("pageInfo", finalPageInfo);
+ finalResultMap.put("columns", result.get("columns"));
+ finalResultMap.put("countResult", result.get("countResult"));
+ finalResultMap.put("reportId", id);
+ return finalResultMap;
+ }
+
+ return result;
+ }
+ }
// 列表data
From 2ba4bb72db413c1ebf11926c1d147d0484658c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 9 Oct 2024 18:10:38 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E8=81=8C=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../report/service/impl/SalaryStatisticsEmployeeServiceImpl.java | 1 +
.../salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 57a8d103d..5728f0886 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -278,6 +278,7 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
map.put("jobTitle", Util.null2String(emp.getJobtitleName()));
map.put("status", Util.null2String(NumberUtil.isNumber(emp.getStatus()) ? SalaryEmployeeStatusEnum.parseByValue(Integer.valueOf(emp.getStatus())).getDefaultLabel() : null));
map.put("workCode", Util.null2String(emp.getWorkcode()));
+ map.put("companystartdate", Util.null2String(emp.getCompanystartdate()));
// IncomeCategoryEnum incomeCategoryEnum = IncomeCategoryEnum.parseByValue(Integer.parseInt(se.getIncomeCategory()));
// map.put("incomeCategory", Objects.isNull(incomeCategoryEnum) ? "" : SalaryI18nUtil.getI18nLabel(incomeCategoryEnum.getLabelId(), incomeCategoryEnum.getDefaultLabel()));
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index 66eeff817..646600f08 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -136,6 +136,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "岗位"), "jobTitle"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "员工状态"), "status"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "工号"), "workCode"));
+ columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "入职日期"), "companystartdate"));
}
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "次数"), "acctTimes").setDisplay(WeaBoolAttr.FALSE));
// columns.add(new WeaTableColumn("100px",SalaryI18nUtil.getI18nLabel( 121908, "收入所得项目"), "incomeCategory"));
From 861cda00faf7db815ca8a68c0371f4bd481b9d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 10 Oct 2024 11:39:22 +0800
Subject: [PATCH 10/18] =?UTF-8?q?1=E3=80=81=E6=89=B9=E9=87=8F=E9=94=81?=
=?UTF-8?q?=E5=AE=9A=E3=80=81=E6=89=B9=E9=87=8F=E8=A7=A3=E9=94=81=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E4=BA=BA=E5=91=98=E7=9A=84=E6=89=80=E5=9C=A8=E8=A1=8C?=
=?UTF-8?q?=E7=9A=84=E5=B7=A5=E8=B5=84=E9=A1=B9=E7=9B=AE=EF=BC=8C=E9=9C=80?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=BA=E5=91=98=E7=9A=84=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E6=9D=A5=E8=AE=BE=E7=BD=AE=E3=80=82=202=E3=80=81=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E5=BD=93=E5=89=8D=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E8=A1=A8=E5=A4=B4=E8=83=BD=E5=90=A6=E8=87=AA=E5=8A=A8=E4=B8=BA?=
=?UTF-8?q?=E4=B8=8A=E6=AC=A1=E9=80=89=E6=8B=A9=E7=9A=84=E8=A1=A8=E5=A4=B4?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../po/SalaryAcctResultTemplatePO.java | 7 ++
.../SalaryAcctResultTemplateMapper.xml | 21 +++++
.../service/SalaryAcctExcelService.java | 2 +-
.../SalaryAcctResultTemplateService.java | 2 +-
.../impl/SalaryAcctExcelServiceImpl.java | 83 ++++++++++++-------
.../SalaryAcctResultTemplateServiceImpl.java | 4 +-
.../salary/web/SalaryAcctController.java | 10 +--
7 files changed, 92 insertions(+), 37 deletions(-)
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultTemplatePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultTemplatePO.java
index a8d493a01..d5c4343f9 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultTemplatePO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultTemplatePO.java
@@ -18,6 +18,7 @@ import java.util.Date;
@NoArgsConstructor
@Builder
@Data
+//hrsa_acct_result_template
public class SalaryAcctResultTemplatePO {
/**
* 主键id
@@ -29,6 +30,11 @@ public class SalaryAcctResultTemplatePO {
*/
private String templateName;
+ /**
+ * 模板类型, 0：导出模板 1：公共导出模板 2：导入模板
+ */
+ private Integer type;
+
/**
* 薪资账套id
*/
@@ -51,4 +57,5 @@ public class SalaryAcctResultTemplatePO {
//主键id集合
private Collection ids;
+ private Collection types;
}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTemplateMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTemplateMapper.xml
index 55c41dc1c..bd1ba58d5 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTemplateMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTemplateMapper.xml
@@ -11,6 +11,7 @@
+
@@ -24,6 +25,7 @@
, t.template_name
, t.tenant_key
, t.update_time
+ , t.type
@@ -75,12 +77,21 @@
AND update_time = #{updateTime}
+
+ AND type = #{type}
+
AND id IN
#{id}
+
+ AND type IN
+
+ #{type}
+
+
ORDER BY id DESC
@@ -117,6 +128,9 @@
update_time,
+
+ type,
+
@@ -146,6 +160,9 @@
#{updateTime},
+
+ #{type},
+
@@ -161,6 +178,7 @@
template_name=#{templateName},
tenant_key=#{tenantKey},
update_time=#{updateTime},
+ type=#{type},
WHERE id = #{id} AND delete_type = 0
@@ -194,6 +212,9 @@
update_time=#{updateTime},
+
+ type=#{type},
+
WHERE id = #{id} AND delete_type = 0
diff --git a/src/com/engine/salary/service/SalaryAcctExcelService.java b/src/com/engine/salary/service/SalaryAcctExcelService.java
index 44aed9df9..e23815ba3 100644
--- a/src/com/engine/salary/service/SalaryAcctExcelService.java
+++ b/src/com/engine/salary/service/SalaryAcctExcelService.java
@@ -117,7 +117,7 @@ public interface SalaryAcctExcelService {
ExcelPreviewDTO previewImportSalaryAcctResult(SalaryAcctImportParam param);
- void cacheImportField(List salaryItems);
+ void cacheImportField(SalaryAcctResultTemplateSaveParam param);
void cacheExportField(List salaryItems);
diff --git a/src/com/engine/salary/service/SalaryAcctResultTemplateService.java b/src/com/engine/salary/service/SalaryAcctResultTemplateService.java
index 7696cb4bf..a2b4c9c4a 100644
--- a/src/com/engine/salary/service/SalaryAcctResultTemplateService.java
+++ b/src/com/engine/salary/service/SalaryAcctResultTemplateService.java
@@ -75,5 +75,5 @@ public interface SalaryAcctResultTemplateService {
* @param salarySobId
* @return
*/
- List listBySalarySobId(Long salarySobId);
+ List listBySalarySobId(Long salarySobId,List types);
}
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 01aee1e36..aef1bb7c3 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -591,11 +591,12 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
// .build())
// .collect(Collectors.toList());
// 缓存勾选
- String cacheKey = user.getUID() + SalaryItemConstant.RESULT_IMPORT_FIELD_SIGN;
- String cacheValue = (String) Util_DataCache.getObjVal(cacheKey);
- List checkItems = JsonUtil.parseList(cacheValue, Long.class) == null ? new ArrayList<>() : JsonUtil.parseList(cacheValue, Long.class);
- // 转换成dto
-// return SalaryAcctImportFieldDTO.builder().formulaItems(formulaItems).sqlItems(sqlItems).inputItems(inputItems).checkItems(checkItems).build();
+ List checkItems = new ArrayList<>();
+ List salaryAcctResultTemplatePOS = getSalaryAcctResultTemplateService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId(), Arrays.asList(2));
+ if (CollectionUtils.isNotEmpty(salaryAcctResultTemplatePOS)) {
+ String items = salaryAcctResultTemplatePOS.get(0).getSalaryItemIds();
+ checkItems = Arrays.stream(items.split(",")).map(Long::valueOf).collect(Collectors.toList());
+ }
return SalaryAcctImportFieldDTO.builder().itemsByGroup(itemsByGroup).checkItems(checkItems).build();
}
@@ -667,18 +668,22 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
@Override
public XSSFWorkbook exportImportTemplate(SalaryAcctImportTemplateParam param) {
-// ValidUtil.doValidator(param);
- // 从缓存中获取所选的薪资项目
- String cacheKey = user.getUID() + SalaryItemConstant.RESULT_IMPORT_FIELD_SIGN;
- String cacheValue = (String) Util_DataCache.getObjVal(cacheKey);
- List checkItems = JsonUtil.parseList(cacheValue, Long.class) == null ? new ArrayList<>() : JsonUtil.parseList(cacheValue, Long.class);
+
+ // 查询薪资核算记录
+ SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId());
+ if (Objects.isNull(salaryAcctRecordPO)) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
+ }
+
+ List checkItems = new ArrayList<>();
+ List salaryAcctResultTemplatePOS = getSalaryAcctResultTemplateService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId(), Arrays.asList(2));
+ if (CollectionUtils.isNotEmpty(salaryAcctResultTemplatePOS)) {
+ String items = salaryAcctResultTemplatePOS.get(0).getSalaryItemIds();
+ checkItems = Arrays.stream(items.split(",")).map(Long::valueOf).collect(Collectors.toList());
+ }
+
// 必须选择导入模板所需的薪资项目
if (CollectionUtils.isEmpty(checkItems)) {
- // 获取所有可以选择的薪资项目
- SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId());
- if (Objects.isNull(salaryAcctRecordPO)) {
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
- }
// 查询薪资核算记录所用的薪资账套的薪资项目副本
List salarySobItems = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId());
List salaryItemIds = SalaryEntityUtil.properties(salarySobItems, SalarySobItemPO::getSalaryItemId, Collectors.toList());
@@ -688,11 +693,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
checkItems = salaryItemIds;
}
param.setSalaryItemIds(checkItems);
- // 查询薪资核算记录
- SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId());
- if (Objects.isNull(salaryAcctRecordPO)) {
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
- }
+
// // 模板表头(默认必带"个税扣缴义务人"、"姓名")
// List