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

只获取正常且报送成功的

This commit is contained in:
钱涛 2024-03-08 15:09:42 +08:00
parent 6aef2856e8
commit ddc9188cd9
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
View File

@ -261,15 +261,15 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
}
getEmployeeDeclareMapper().update(employeeDeclare);
// 记录日志
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId()));
loggerContext.setTargetName((taxAgent == null ? "" : taxAgent.getName()) + "-" + employeeDeclare.getEmployeeName());
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑报送人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑报送人员：") + employeeDeclare.getEmployeeName());
loggerContext.setOldValues(originEmployeeDeclare);
loggerContext.setNewValues(employeeDeclare);
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId()));
loggerContext.setTargetName((taxAgent == null ? "" : taxAgent.getName()) + "-" + employeeDeclare.getEmployeeName());
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑报送人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑报送人员：") + employeeDeclare.getEmployeeName());
loggerContext.setOldValues(originEmployeeDeclare);
loggerContext.setNewValues(employeeDeclare);
SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext);
}
}
@ -398,13 +398,13 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(Util.null2String(employeeDeclare.getTaxAgentId()));
loggerContext.setTargetName((taxAgent == null ? "" :taxAgent.getName()) + "-" + employeeDeclare.getEmployeeName());
loggerContext.setTargetName((taxAgent == null ? "" : taxAgent.getName()) + "-" + employeeDeclare.getEmployeeName());
loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除报送人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除报送人员：") + employeeDeclare.getEmployeeName());
loggerContext.setNewValues(employeeDeclare);
SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext);
}
}
}
@Override
@ -450,12 +450,12 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
// 查询本月已有的需要报送的人员
List<EmployeeDeclarePO> employeeDeclares = listByTaxCycleAndTaxAgentId(refreshParam.getTaxCycle(), refreshParam.getTaxAgentId());
// 查询上月已有报送的人员
List<EmployeeDeclarePO> preTaxCycleEmployeeDeclares = listByTaxCycleAndTaxAgentId(SalaryDateUtil.plusMonths(refreshParam.getTaxCycle(), -1), refreshParam.getTaxAgentId());
//只需要正常的
// .stream()
// .filter(e -> Objects.equals(e.getEmploymentStatus(), EmploymentStatusEnum.NORMAL.getValue())
// && Objects.equals(e.getDeclareStatus(), DeclareStatusEnum.DECLARE_SUCCESS.getValue()))
// .collect(Collectors.toList());
List<EmployeeDeclarePO> preTaxCycleEmployeeDeclares = listByTaxCycleAndTaxAgentId(SalaryDateUtil.plusMonths(refreshParam.getTaxCycle(), -1), refreshParam.getTaxAgentId())
//只需要正常的
.stream()
.filter(e -> Objects.equals(e.getEmploymentStatus(), EmploymentStatusEnum.NORMAL.getValue())
&& Objects.equals(e.getDeclareStatus(), DeclareStatusEnum.DECLARE_SUCCESS.getValue()))
.collect(Collectors.toList());
// 查询个税扣缴义务人
TaxAgentPO taxAgent = getTaxAgentService(user).getById(refreshParam.getTaxAgentId());
// 根据税款所属期计算出薪资周期
@ -526,15 +526,15 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
// updateBatchById(result.getEmployeeDeclares());
}
// 记录日志
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(refreshParam.getTaxAgentId().toString());
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", SalaryDateUtil.getFormatYearMonth(refreshParam.getTaxCycle())));
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "刷新数据"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "刷新数据"));
SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext);
// 记录日志
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(refreshParam.getTaxAgentId().toString());
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", SalaryDateUtil.getFormatYearMonth(refreshParam.getTaxCycle())));
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "刷新数据"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "刷新数据"));
SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext);
}
@Override
@ -615,14 +615,14 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
.setUpdateTime(now);
getEmployeeDeclareRecordService(user).save(employeeDeclareRecord);
// 记录日志
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(param.getTaxAgentId().toString());
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", SalaryDateUtil.getFormatYearMonth(param.getTaxCycle())));
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "全部报送"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "全部报送"));
SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext);
LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId(param.getTaxAgentId().toString());
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", SalaryDateUtil.getFormatYearMonth(param.getTaxCycle())));
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "全部报送"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "全部报送"));
SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext);
}
@Override