diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java index 82410a3c4..d2b5384a5 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java @@ -6,8 +6,10 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; import com.engine.salary.common.taxdeclare.AsyncRequestIdDTO; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SzyhApiConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.employeedeclare.bo.EmployeeDeclareList; import com.engine.salary.entity.employeedeclare.bo.EmployeeDeclareRefresh; @@ -26,6 +28,7 @@ import com.engine.salary.entity.taxagent.po.TaxAgentTaxReturnPO; import com.engine.salary.entity.taxapiflow.bo.TaxApiFlowBO; import com.engine.salary.entity.taxapiflow.po.TaxDeclarationApiFlowRecordPO; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationApiConfigPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalaryCycleTypeEnum; import com.engine.salary.enums.SalaryOnOffEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; @@ -41,6 +44,7 @@ import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.employeedeclare.EmployeeDeclareMapper; import com.engine.salary.service.*; import com.engine.salary.util.*; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -48,7 +52,6 @@ import com.engine.salary.util.valid.SalaryCardUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -223,14 +226,15 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla employeeDeclare.setUpdateTime(now); getEmployeeDeclareMapper().insertIgnoreNull(employeeDeclare); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId())); -// loggerContext.setTargetName(employeeDeclare.getEmployeeName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156441, "新增报送人员")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156441, "新增报送人员：") + employeeDeclare.getEmployeeName()); -// loggerContext.setNewValues(employeeDeclare); -// employeeDeclareLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId())); + loggerContext.setTargetName(employeeDeclare.getEmployeeName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增报送人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增报送人员：") + employeeDeclare.getEmployeeName()); + loggerContext.setNewValues(employeeDeclare); + SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext); } else { EmployeeDeclarePO originEmployeeDeclare = getById(saveParam.getId()); if (Objects.isNull(originEmployeeDeclare)) { @@ -256,15 +260,16 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla } getEmployeeDeclareMapper().update(employeeDeclare); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId())); -// loggerContext.setTargetName(employeeDeclare.getEmployeeName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156444, "编辑报送人员")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156444, "编辑报送人员：") + employeeDeclare.getEmployeeName()); -// loggerContext.setOldValues(originEmployeeDeclare); -// loggerContext.setNewValues(employeeDeclare); -// employeeDeclareLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId())); + loggerContext.setTargetName(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); } } @@ -385,16 +390,17 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla } getEmployeeDeclareMapper().deleteByIds(ids, new Date()); // 记录日志 -// for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(Util.null2String(employeeDeclare.getTaxAgentId())); -// loggerContext.setTargetName(employeeDeclare.getEmployeeName()); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156445, "删除报送人员")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156445, "删除报送人员：") + employeeDeclare.getEmployeeName()); -// loggerContext.setNewValues(employeeDeclare); -// employeeDeclareLoggerTemplate.write(loggerContext); -// } + for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(Util.null2String(employeeDeclare.getTaxAgentId())); + loggerContext.setTargetName(employeeDeclare.getEmployeeName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156445, "删除报送人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156445, "删除报送人员：") + employeeDeclare.getEmployeeName()); + loggerContext.setNewValues(employeeDeclare); + SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext); + } } @Override @@ -514,15 +520,16 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla result.getEmployeeDeclares().forEach(getEmployeeDeclareMapper()::updateIgnoreNull); // updateBatchById(result.getEmployeeDeclares()); } -// // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(refreshParam.getTaxAgentId() + "-" + refreshParam.getTaxCycle().toString()); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(156468, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", refreshParam.getTaxCycle().toString())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156447, "刷新数据")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156447, "刷新数据")); -// employeeDeclareLoggerTemplate.write(loggerContext); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(refreshParam.getTaxAgentId() + "-" + refreshParam.getTaxCycle().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", refreshParam.getTaxCycle().toString())); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "刷新数据")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "刷新数据")); + SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext); } @Override @@ -603,14 +610,14 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla .setUpdateTime(now); getEmployeeDeclareRecordService(user).save(employeeDeclareRecord); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(param.getTaxAgentId() + "-" + param.getTaxCycle().toString()); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(156468, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", param.getTaxCycle().toString())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156450, "全部报送")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156450, "全部报送")); -// employeeDeclareLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(param.getTaxAgentId() + "-" + param.getTaxCycle().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", param.getTaxCycle().toString())); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "全部报送")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "全部报送")); + SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext); } @Override @@ -685,14 +692,14 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla // 删除原来的人员报送记录 getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId()); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(param.getTaxAgentId() + "-" + param.getTaxCycle().toString()); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(156468, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", param.getTaxCycle().toString())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156452, "获取结果反馈")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156452, "获取结果反馈")); -// employeeDeclareLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(param.getTaxAgentId() + "-" + param.getTaxCycle().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人:「{0}」税款所属期:「{1}」").replace("{0}", taxAgent.getName()).replace("{1}", param.getTaxCycle().toString())); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "获取结果反馈")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "获取结果反馈")); + SalaryElogConfig.employeeDeclareLoggerTemplate.write(loggerContext); // 更新流量统计 getTaxDeclarationApiBillingService(user).updateApiFlowInfo(apiFlowUpdateWrapper); // 报送失败的 diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java index 19e1fb3d1..68ac9e277 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java @@ -2,10 +2,14 @@ package com.engine.salary.service.impl; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.eccom.pc.table.WeaTableColumn; +import com.engine.common.util.LogUtil; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.entity.taxdeclaration.dto.AbnormalEmployeeListDTO; import com.engine.salary.entity.taxdeclaration.dto.FailEmployeeListDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationValueListDTO; @@ -13,6 +17,7 @@ import com.engine.salary.entity.taxdeclaration.param.AbnormalEmployeeListQueryPa import com.engine.salary.entity.taxdeclaration.param.DownloadTemplateParam; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationValueListQueryParam; import com.engine.salary.entity.taxdeclaration.po.*; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum; @@ -22,9 +27,7 @@ import com.engine.salary.enums.taxdeclaration.SourceEnum; import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.service.*; import com.engine.salary.sys.entity.po.SalarySysConfPO; -import com.engine.salary.util.JsonUtil; -import com.engine.salary.util.SalaryEntityUtil; -import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.*; import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSheetData; @@ -128,6 +131,17 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar String sheetName = SalaryI18nUtil.getI18nLabel(100090, "个税申报表"); + // 记录日志 + TaxAgentPO taxAgent = getTaxAgentService(user).getById(taxDeclarationPO.getTaxAgentId()); + SalaryLoggerUtil.recordExportSingleLog(SalaryElogConfig.taxDeclarationLoggerTemplate, + taxDeclarationPO.getTaxDeclareRecordId(), + SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgent.getName()) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclarationPO.getTaxCycle())), + "导出个税申报表", + "导出个税申报表", + user); + return ExcelUtil.genWorkbook(rows, sheetName); } diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java index 50e9a0568..7490af8d5 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java @@ -4,8 +4,8 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; import com.engine.salary.common.YearMonthRange; -import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; @@ -24,7 +24,6 @@ import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; -import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.AddUpSituationMapper; import com.engine.salary.mapper.salaryacct.SalaryAcctRecordMapper; @@ -33,11 +32,11 @@ import com.engine.salary.service.*; import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java index 5e8d7b062..88cbf4316 100644 --- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java @@ -4,8 +4,10 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; import com.engine.salary.common.YearMonthRange; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SzyhApiConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.employeedeclare.bo.EmployeeDeclareRequest; import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO; @@ -34,6 +36,7 @@ import com.engine.salary.entity.taxdeclaration.response.CancelDeclareFeedbackRes import com.engine.salary.entity.taxdeclaration.response.DeclareTaxFeedbackResponse; import com.engine.salary.entity.taxdeclaration.response.DeclareTaxResponse; import com.engine.salary.entity.taxdeclaration.response.UpdateDeclareResponse; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.employeedeclare.DeclareStatusEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; @@ -47,6 +50,7 @@ import com.engine.salary.remote.tax.response.employee.GetDeclareTaxResultFeedbac import com.engine.salary.service.*; import com.engine.salary.service.factory.TaxPaymentServiceFactory; import com.engine.salary.util.*; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; @@ -54,7 +58,6 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -316,20 +319,20 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe //更新核算记录状态 getSalaryAcctRecordService(user).updateStatusByIds(salaryAcctRecordIds, SalaryAcctRecordStatusEnum.DECLARED); -// // 记录日志 -// for (TaxDeclareRecordPO taxDeclareRecord : newTaxDeclareRecords) { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgentNameMap.getOrDefault(taxDeclareRecord.getTaxAgentId(), StringUtils.EMPTY)) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(99815, "生成个税申报表")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(99815, "生成个税申报表")); -// loggerContext.setNewValues(taxDeclareRecord); -// taxDeclarationLoggerTemplate.write(loggerContext); -// } + // 记录日志 + for (TaxDeclareRecordPO taxDeclareRecord : newTaxDeclareRecords) { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgentNameMap.getOrDefault(taxDeclareRecord.getTaxAgentId(), StringUtils.EMPTY)) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "生成个税申报表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "生成个税申报表")); + loggerContext.setNewValues(taxDeclareRecord); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); + } } @Override @@ -593,25 +596,26 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe }); // 记录日志 -// writeDeleteLog(taxDeclareRecords); + writeDeleteLog(taxDeclareRecords); } -// private void writeDeleteLog(List taxDeclareRecords) { -// // 记录日志 -// List taxAgents = getTaxAgentService(user).listByIds(SalaryEntityUtil.properties(taxDeclareRecords, TaxDeclareRecordPO::getTaxAgentId)); -// Map taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName); -// for (TaxDeclareRecordPO taxDeclareRecord : taxDeclareRecords) { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgentNameMap.getOrDefault(taxDeclareRecord.getTaxAgentId(), com.baomidou.mybatisplus.core.toolkit.StringUtils.EMPTY)) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156453, "删除个税申报表")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156453, "删除个税申报表")); -// taxDeclarationLoggerTemplate.write(loggerContext); -// } -// } + private void writeDeleteLog(List taxDeclareRecords) { + // 记录日志 + List taxAgents = getTaxAgentService(user).listByIds(SalaryEntityUtil.properties(taxDeclareRecords, TaxDeclareRecordPO::getTaxAgentId)); + Map taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName); + for (TaxDeclareRecordPO taxDeclareRecord : taxDeclareRecords) { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgentNameMap.getOrDefault(taxDeclareRecord.getTaxAgentId(), StringUtils.EMPTY)) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156453, "删除个税申报表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156453, "删除个税申报表")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); + } + } @Override public void declare(Long id) { @@ -684,17 +688,17 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe getTaxDeclareFailService(user).deleteByTaxDeclareRecordIds(Collections.singleton(taxDeclareRecord.getId())); // 记录日志 -// TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgent.getName()) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156454, "在线申报")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156454, "在线申报")); -// taxDeclarationLoggerTemplate.write(loggerContext); + TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgent.getName()) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156454, "在线申报")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156454, "在线申报")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); } @Override @@ -815,17 +819,17 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe getTaxDeclarationApiBillingService(user).updateApiFlowInfo(apiFlowUpdateWrapper); // 记录日志 -// TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgent.getName()) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(currentEmployeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156455, "申报反馈")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156455, "申报反馈")); -// taxDeclarationLoggerTemplate.write(loggerContext); + TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgent.getName()) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setUser(user); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "申报反馈")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "申报反馈")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); } @Override @@ -872,18 +876,18 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe taxDeclareRecord.setUpdateTime(new Date()); getTaxDeclareRecordMapper().updateIgnoreNull(taxDeclareRecord); -// // 记录日志 -// TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgent.getName()) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156456, "申报作废")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156456, "申报作废")); -// taxDeclarationLoggerTemplate.write(loggerContext); + // 记录日志 + TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgent.getName()) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "申报作废")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "申报作废")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); } @Override @@ -924,17 +928,17 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe getTaxDeclareRecordMapper().updateIgnoreNull(taxDeclareRecord); // 记录日志 -// TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgent.getName()) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(156457, "获取申报作废的反馈")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156457, "获取申报作废的反馈")); -// taxDeclarationLoggerTemplate.write(loggerContext); + TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgent.getName()) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setUser(user); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "获取申报作废的反馈")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "获取申报作废的反馈")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); } @@ -1007,17 +1011,17 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe getTaxDeclareRecordMapper().updateIgnoreNull(taxDeclareRecord); // 记录日志 -// TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgent.getName()) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(177637, "更正申报")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(177637, "更正申报")); -// taxDeclarationLoggerTemplate.write(loggerContext); + TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人「{0}」税款所属期「{1}」") + .replace("{0}", taxAgent.getName()) + .replace("{1}", SalaryDateUtil.getFormatYearMonth(taxDeclareRecord.getTaxCycle()))); + loggerContext.setUser(user); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更正申报")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更正申报")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); } @@ -1059,17 +1063,17 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe // getTaxDeclareRecordMapper().updateIgnoreNull(taxDeclareRecord); // 记录日志 -// TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") -// .replace("{0}", taxAgent.getName()) -// .replace("{1}", taxDeclareRecord.getTaxCycle())); -// loggerContext.setOperator(Util.null2String(employeeId)); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(177637, "更正申报")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(177637, "更正申报")); -// taxDeclarationLoggerTemplate.write(loggerContext); + // TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); + // LoggerContext loggerContext = new LoggerContext<>(); + // loggerContext.setTargetId(String.valueOf(taxDeclareRecord.getId())); + // loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(203562, "个税扣缴义务人「{0}」税款所属期「{1}」") + // .replace("{0}", taxAgent.getName()) + // .replace("{1}", taxDeclareRecord.getTaxCycle())); + // loggerContext.setOperator(Util.null2String(employeeId)); + // loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + // loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(177637, "更正申报")); + // loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(177637, "更正申报")); + // taxDeclarationLoggerTemplate.write(loggerContext); } @Override