修复核算工号不显示的问题
This commit is contained in:
parent
c2c4149442
commit
4fe3a61d5d
|
|
@ -82,6 +82,7 @@ public class SalaryAcctFormulaBO {
|
|||
.jobcall(simpleEmployee.getJobcall())
|
||||
.companystartdate(simpleEmployee.getCompanystartdate())
|
||||
.birthday(simpleEmployee.getBirthday())
|
||||
.workcode(simpleEmployee.getWorkcode())
|
||||
.build();
|
||||
return JsonUtil.parseMap(JsonUtil.toJsonString(formulaEmployee), String.class);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,143 @@
|
|||
package com.engine.salary.service;
|
||||
|
||||
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
|
||||
import com.engine.salary.entity.salaryacct.dto.ConsolidatedTaxDetailDTO;
|
||||
import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultDetailDTO;
|
||||
import com.engine.salary.entity.salaryacct.param.SalaryAcctCalculateParam;
|
||||
import com.engine.salary.entity.salaryacct.param.SalaryAcctResultQueryParam;
|
||||
import com.engine.salary.entity.salaryacct.param.SalaryAcctResultSaveParam;
|
||||
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
|
||||
import com.engine.salary.util.page.PageInfo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 薪资核算结果
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
public interface SalaryAcctReportService {
|
||||
|
||||
/**
|
||||
* 根据薪资核算记录的id查询薪资核算结果
|
||||
*
|
||||
* @param salaryAcctRecordIds 薪资核算记录的id
|
||||
* @return
|
||||
*/
|
||||
List<SalaryAcctResultPO> listBySalaryAcctRecordIds(Collection<Long> salaryAcctRecordIds);
|
||||
|
||||
/**
|
||||
* 根据薪资核算人员的主键id查询薪资核算结果
|
||||
*
|
||||
* @param salaryAcctEmployeeId 薪资核算人员的主键id
|
||||
* @return
|
||||
*/
|
||||
List<SalaryAcctResultPO> listBySalaryAcctEmployeeId(Long salaryAcctEmployeeId);
|
||||
|
||||
/**
|
||||
* 根据薪资核算人员的主键id查询薪资核算结果
|
||||
*
|
||||
* @param salaryAcctEmployeeIds 薪资核算人员的主键id
|
||||
* @return
|
||||
*/
|
||||
List<SalaryAcctResultPO> listBySalaryAcctEmployeeIds(Collection<Long> salaryAcctEmployeeIds);
|
||||
|
||||
/**
|
||||
* 根据薪资核算id、人员id查询薪资核算结果
|
||||
*
|
||||
* @param salaryAcctRecordIds 薪资核算记录id
|
||||
* @param employeeIds 人员id
|
||||
* @return
|
||||
*/
|
||||
List<SalaryAcctResultPO> listBySalaryAcctRecordIdsAndEmployeeIds(Collection<Long> salaryAcctRecordIds, Collection<Long> employeeIds);
|
||||
|
||||
/**
|
||||
* 根据薪资核算人员的主键id查询薪资核算结果
|
||||
*
|
||||
* @param salaryAcctEmployeeId 薪资核算人员的主键id
|
||||
* @return
|
||||
*/
|
||||
SalaryAcctResultDetailDTO getBySalaryAcctEmployeeId(Long salaryAcctEmployeeId);
|
||||
|
||||
/**
|
||||
* 根据薪资核算结果列表查询条件查询薪资核算结果（分页）
|
||||
*
|
||||
* @param queryParam 列表查询条件
|
||||
* @return
|
||||
*/
|
||||
PageInfo<Map<String, Object>> listPageByParam(SalaryAcctResultQueryParam queryParam);
|
||||
|
||||
/**
|
||||
* 根据薪资核算结果列表查询条件查询薪资核算结果
|
||||
*
|
||||
* @param queryParam 列表查询条件
|
||||
* @return
|
||||
*/
|
||||
List<Map<String, Object>> listByParam(SalaryAcctResultQueryParam queryParam);
|
||||
|
||||
/**
|
||||
* 获取合并计税详情
|
||||
*
|
||||
* @param salaryAcctEmployeeId 薪资核算人员
|
||||
* @return
|
||||
*/
|
||||
ConsolidatedTaxDetailDTO getConsolidatedTaxDetail(Long salaryAcctEmployeeId);
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param saveParam 保存参数
|
||||
*/
|
||||
void save(SalaryAcctResultSaveParam saveParam);
|
||||
|
||||
/**
|
||||
* 批量保存
|
||||
*
|
||||
* @param salaryAcctResultPOS 薪资核算结果
|
||||
*/
|
||||
void batchSave(Collection<SalaryAcctResultPO> salaryAcctResultPOS);
|
||||
|
||||
/**
|
||||
* 根据薪资核算人员id删除薪资核算结果
|
||||
*
|
||||
* @param salaryAcctEmployeeIds 薪资核算人员id
|
||||
*/
|
||||
void deleteBySalaryAcctEmployeeIds(Collection<Long> salaryAcctEmployeeIds);
|
||||
|
||||
/**
|
||||
* 根据薪资核算人员id、薪资项目id删除薪资核算结果
|
||||
*
|
||||
* @param salaryAcctEmployeeIds 薪资核算人员id
|
||||
* @param salaryItemIds 薪资项目id
|
||||
*/
|
||||
void deleteByAcctEmployeeIdsAndSalaryItemIds(Collection<Long> salaryAcctEmployeeIds, Collection<Long> salaryItemIds);
|
||||
|
||||
/**
|
||||
* 根据薪资核算记录id删除薪资核算结果
|
||||
*
|
||||
* @param salaryAcctRecordIds 薪资核算记录id
|
||||
*/
|
||||
void deleteBySalaryAcctRecordIds(Collection<Long> salaryAcctRecordIds);
|
||||
|
||||
/**
|
||||
* 薪资核算
|
||||
*
|
||||
* @param calculateParam
|
||||
* @param simpleEmployee
|
||||
*/
|
||||
void calculate(SalaryAcctCalculateParam calculateParam, DataCollectionEmployee simpleEmployee);
|
||||
|
||||
/**
|
||||
* 根据薪资核算记录的id、个税扣缴义务人查询薪资核算结果
|
||||
*
|
||||
* @param salaryAcctRecordIds 薪资核算记录的id
|
||||
* @param taxAgentIds 个税扣缴义务人id
|
||||
* @return
|
||||
*/
|
||||
List<SalaryAcctResultPO> listBySalaryAcctRecordIdsAndTaxAgentIds(Collection<Long> salaryAcctRecordIds, Collection<Long> taxAgentIds);
|
||||
}
|
||||
|
|
@ -421,6 +421,11 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
|
|||
getSalaryAcctRecordMapper().updateIgnoreNull(salaryAcctRecordPO);
|
||||
// 生成工资单
|
||||
getSalarySendService(user).generateSalaryBill(salaryAcctRecordId);
|
||||
|
||||
//todo 薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
||||
|
||||
|
||||
|
||||
// 记录日志
|
||||
// String targetName = getLogTargetNameById(salaryAcctRecordId);
|
||||
// LoggerContext<SalaryAcctRecordPO> loggerContext = new LoggerContext<>();
|
||||
|
|
|
|||
|
|
@ -353,11 +353,15 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
|
|||
SalaryAcctResultPOEncrypt.encryptList(salaryAcctResultPOS);
|
||||
List<List<SalaryAcctResultPO>> partition = Lists.partition(salaryAcctResultPOS, 100);
|
||||
partition.forEach(getSalaryAcctResultMapper()::batchInsert);
|
||||
|
||||
//todo 报表
|
||||
}
|
||||
|
||||
|
||||
// 查询操作日志的targetName
|
||||
String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(salaryAcctEmployeePO.getSalaryAcctRecordId());
|
||||
// String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(salaryAcctEmployeePO.getSalaryAcctRecordId());
|
||||
// 查询人员信息
|
||||
DataCollectionEmployee simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(salaryAcctEmployeePO.getEmployeeId());
|
||||
// DataCollectionEmployee simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(salaryAcctEmployeePO.getEmployeeId());
|
||||
// 查询个税扣缴义务人
|
||||
// TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(salaryAcctEmployeePO.getTaxAgentId());
|
||||
// 记录日志
|
||||
|
|
@ -380,6 +384,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
|
|||
SalaryAcctResultPOEncrypt.encryptList(list);
|
||||
List<List<SalaryAcctResultPO>> partition = Lists.partition(list, 100);
|
||||
partition.forEach(getSalaryAcctResultMapper()::batchInsert);
|
||||
|
||||
//todo 报表
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue